This patch documents the changes needed in djdev203 to resolve the name-clash
existing between the GNU gettext and the BORLAND-compatibility gettext functions.
This issue has been fixed in djdev204 so this patch is not required for
DJGPP 2.04 at all.
Apply the patch running the command:
   patch -p1 < conio.diffs
from the top srcdir.
The GNU gettext function is declared in libintl.h and the BORLAND-compatibility
gettext function is declared in conio.h.  To resolve this name-clash, the
gettext function from conio.h and conio.c has been renamed into _conio_gettext.
In conio.h, a macro gettext, that will expand into _conio_gettext, has been
introduced.  This macro expansion will be supressed if libintl.h is included
by the same source file.  In this case, the BORLAND-compatibility function will
only be available as _conio_gettext.

This has the following concequences for the user:
1) The user wants to use BORLAND-compatibility gettext from conio.h only.
   In this case the user must include conio.h in the source file and the
   gettext keyword makes *always* reference to BORLAND-compatibility gettext.
   There are no user visible changes at all.
2) The user wants to use GNU gettext from libintl.h only.
   In this case the user must include libintl.h in the source file and the
   gettext keyword makes *always* reference to GNU gettext.
   There are no user visible changes at all.
3) The user wants to use both gettext functions in the same source file.
   In this case both headers, libintl.h and conio.h, must be included in the
   source file and the keyword gettext makes **always** reference to
   GNU gettext and **never** to BORLAND-compatibility gettext.
   To use the BORLAND-compatibility gettext in this case the user must use
   the keyword: _conio_gettext instead of gettext.

Regards,
Guerrero, Juan Manuel






