mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-04 01:04:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

dcgettext.c: Outside libc, use local variable names that don't clash with those in libc.

Browse Source 
2000-09-18  Bruno Haible  <haible@clisp.cons.org>

	* intl/dcgettext.c: Outside libc, use local variable names that don't
	clash with those in libc.
	* intl/bindtextdom.c: Likewise.
	* intl/textdomain.c: Likewise.

From-SVN: r36516
This commit is contained in:
Bruno Haible 2000-09-18 22:05:52 +00:00 committed by Philipp Thomas
parent 226ed43f1e
commit e0efd58f0f
4 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/intl/ChangeLog
View File

@ -1,3 +1,10 @@
2000-09-18 Bruno Haible <haible@clisp.cons.org>
* intl/dcgettext.c: Outside libc, use local variable names that don't
clash with those in libc.
* intl/bindtextdom.c: Likewise.
* intl/textdomain.c: Likewise.
2000-09-05 John David Anglin <dave@hiauly1.hia.nrc.ca> 2000-09-05 John David Anglin <dave@hiauly1.hia.nrc.ca>
* gettext.h (nls_uint32): Choose via INT_MAX instead of UINT_MAX. * gettext.h (nls_uint32): Choose via INT_MAX instead of UINT_MAX.

8
gcc/intl/bindtextdom.c
View File

@ -46,6 +46,14 @@ void free ();
#include "gettext.h" #include "gettext.h"
#include "gettextP.h" #include "gettextP.h"
/* The internal variables in the standalone libintl.a must have different
names than the internal variables in GNU libc, otherwise programs
using libintl.a cannot be linked statically. */
#if !defined _LIBC
# define _nl_default_dirname _nl_default_dirname__
# define _nl_domain_bindings _nl_domain_bindings__
#endif
/* @@ end of prolog @@ */ /* @@ end of prolog @@ */
/* Contains the default location of the message catalogs. */ /* Contains the default location of the message catalogs. */

10
gcc/intl/dcgettext.c
View File

@ -85,6 +85,16 @@ void free ();
#endif #endif
#include "hash-string.h" #include "hash-string.h"
/* The internal variables in the standalone libintl.a must have different
names than the internal variables in GNU libc, otherwise programs
using libintl.a cannot be linked statically. */
#if !defined _LIBC
# define _nl_default_default_domain _nl_default_default_domain__
# define _nl_current_default_domain _nl_current_default_domain__
# define _nl_default_dirname _nl_default_dirname__
# define _nl_domain_bindings _nl_domain_bindings__
#endif
/* @@ end of prolog @@ */ /* @@ end of prolog @@ */
#ifdef _LIBC #ifdef _LIBC

8
gcc/intl/textdomain.c
View File

@ -39,6 +39,14 @@
# include "libgettext.h" # include "libgettext.h"
#endif #endif
/* The internal variables in the standalone libintl.a must have different
names than the internal variables in GNU libc, otherwise programs
using libintl.a cannot be linked statically. */
#if !defined _LIBC
# define _nl_default_default_domain _nl_default_default_domain__
# define _nl_current_default_domain _nl_current_default_domain__
#endif
/* @@ end of prolog @@ */ /* @@ end of prolog @@ */
/* Name of the default text domain. */ /* Name of the default text domain. */