From: "Juan Manuel Guerrero" <ST001906 AT HRZ1 DOT HRZ DOT TU-Darmstadt DOT De>
Organization: Darmstadt University of Technology
To: djgpp-workers AT delorie DOT com
Date: Mon, 16 Jul 2001 23:44:17 +0200
MIME-Version: 1.0
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7BIT
Subject: The BORLAND/GNU gettext issue once again
X-mailer: Pegasus Mail for Windows (v2.54DE)
Message-ID: <18535A74BC9@HRZ1.hrz.tu-darmstadt.de>
Reply-To: djgpp-workers AT delorie DOT com

Today I have seen that one of the patches submitted by me some months ago
to resolve the name conflict between BORLAND and GNU gettext functions has
been applied to the CVS tree. Unfortunatelly from the two patches available
the wrong one has been applied. The bug introduced is the use of the wrong
macro to check if libintl.h has been included or not. The small patch below
will solve the bug introduced in CVS tree by using the wrong version of the
patch. I would seriously suggest to apply this patch as soon as possible to
fix this issue one and for all. With this patch applied it will become possible
to use GNU gettext 0.10.36/37/38 and any later version out-of-the-box together
with the CVS libc. If this patch is not applied this will never be possible.

Regards,
Juan M. Guerrero


diff -acprNC5 djgpp.orig/include/conio.h djgpp/include/conio.h
*** djgpp.orig/include/conio.h	Sat Jun 30 15:13:00 2001
--- djgpp/include/conio.h	Mon Jul 16 23:28:06 2001
*************** void    window(int _left, int _top, int 
*** 100,112 ****
                                from libc */
  
  /* This is to resolve the name clash between
     gettext from conio.h and gettext from libintl.h.
     IMPORTANT:
!    If both headers are included, gettext from libintl.h
!    takes ALWAYS precedence over gettext from conio.h. */
! #ifndef __dj_include_libintl_h_
  # undef  gettext
  # define gettext _conio_gettext
  #endif
  
  #endif /* !_POSIX_SOURCE */
--- 100,115 ----
                                from libc */
  
  /* This is to resolve the name clash between
     gettext from conio.h and gettext from libintl.h.
     IMPORTANT:
!    If both headers are included, the gettext keyword will always
!    make reference to the GNU gettext function declared in libintl.h
!    and never to the BORLAND-compatibility gettext function declared
!    in conio.h. In this case, BORLAND-compatibility gettext function
!    will only be available as _conio_gettext. */
! #ifndef __USE_GNU_GETTEXT
  # undef  gettext
  # define gettext _conio_gettext
  #endif
  
  #endif /* !_POSIX_SOURCE */