This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
intl patches (3)
- From: Bruno Haible <bruno at clisp dot org>
- To: libc-alpha at sources dot redhat dot com
- Date: Wed, 11 Dec 2002 19:27:53 +0100 (CET)
- Subject: intl patches (3)
To avoid clashes with Solaris native gettext() functions, I had to
make the exported function names from libintl.so different from 'gettext'.
I chose 'libintl_gettext' instead of 'gettext__' because it points the
developers in the right direction when they get a linker error or look at
"nm" output. Inside libc, nothing changes.
2002-04-27 Bruno Haible <bruno@clisp.org>
* intl/gettextP.h: Use prefix "libintl_" instead of suffix "__".
* intl/dcigettext.c: Likewise.
* intl/dcgettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/gettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/bindtextdom.c: Likewise.
* intl/plural-exp.h: Likewise.
--- glibc-20021126/intl/bindtextdom.c.bak Mon Aug 5 13:24:33 2002
+++ glibc-20021126/intl/bindtextdom.c Wed Dec 11 15:11:29 2002
@@ -46,8 +46,8 @@
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__
+# define _nl_default_dirname libintl_nl_default_dirname
+# define _nl_domain_bindings libintl_nl_domain_bindings
#endif
/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
@@ -83,8 +83,8 @@
# define strdup(str) __strdup (str)
# endif
#else
-# define BINDTEXTDOMAIN bindtextdomain__
-# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__
+# define BINDTEXTDOMAIN libintl_bindtextdomain
+# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
#endif
/* Prototypes for local functions. */
--- glibc-20021126/intl/dcgettext.c.bak Mon Apr 8 20:31:34 2002
+++ glibc-20021126/intl/dcgettext.c Wed Dec 11 15:12:57 2002
@@ -38,8 +38,8 @@
# define DCGETTEXT __dcgettext
# define DCIGETTEXT __dcigettext
#else
-# define DCGETTEXT dcgettext__
-# define DCIGETTEXT dcigettext__
+# define DCGETTEXT libintl_dcgettext
+# define DCIGETTEXT libintl_dcigettext
#endif
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
--- glibc-20021126/intl/dcigettext.c.bak Mon Nov 4 13:25:25 2002
+++ glibc-20021126/intl/dcigettext.c Wed Dec 11 15:19:01 2002
@@ -103,10 +117,10 @@
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__
+# define _nl_default_default_domain libintl_nl_default_default_domain
+# define _nl_current_default_domain libintl_nl_current_default_domain
+# define _nl_default_dirname libintl_nl_default_dirname
+# define _nl_domain_bindings libintl_nl_domain_bindings
#endif
/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
@@ -332,7 +349,7 @@
#ifdef _LIBC
# define DCIGETTEXT __dcigettext
#else
-# define DCIGETTEXT dcigettext__
+# define DCIGETTEXT libintl_dcigettext
#endif
/* Lock variable to protect the global data in the gettext implementation. */
--- glibc-20021126/intl/dcngettext.c.bak Sat May 4 00:00:00 2002
+++ glibc-20021126/intl/dcngettext.c Wed Dec 11 15:21:37 2002
@@ -38,8 +38,8 @@
# define DCNGETTEXT __dcngettext
# define DCIGETTEXT __dcigettext
#else
-# define DCNGETTEXT dcngettext__
-# define DCIGETTEXT dcigettext__
+# define DCNGETTEXT libintl_dcngettext
+# define DCIGETTEXT libintl_dcigettext
#endif
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
--- glibc-20021126/intl/dgettext.c.bak Mon Apr 8 20:31:34 2002
+++ glibc-20021126/intl/dgettext.c Wed Dec 11 15:22:03 2002
@@ -40,8 +40,8 @@
# define DGETTEXT __dgettext
# define DCGETTEXT INTUSE(__dcgettext)
#else
-# define DGETTEXT dgettext__
-# define DCGETTEXT dcgettext__
+# define DGETTEXT libintl_dgettext
+# define DCGETTEXT libintl_dcgettext
#endif
/* Look up MSGID in the DOMAINNAME message catalog of the current
--- glibc-20021126/intl/dngettext.c.bak Sat May 4 00:00:00 2002
+++ glibc-20021126/intl/dngettext.c Wed Dec 11 15:22:36 2002
@@ -40,8 +40,8 @@
# define DNGETTEXT __dngettext
# define DCNGETTEXT __dcngettext
#else
-# define DNGETTEXT dngettext__
-# define DCNGETTEXT dcngettext__
+# define DNGETTEXT libintl_dngettext
+# define DCNGETTEXT libintl_dcngettext
#endif
/* Look up MSGID in the DOMAINNAME message catalog of the current
--- glibc-20021126/intl/gettext.c.bak Mon Apr 8 20:31:34 2002
+++ glibc-20021126/intl/gettext.c Wed Dec 11 15:24:18 2002
@@ -45,8 +45,8 @@
# define GETTEXT __gettext
# define DCGETTEXT INTUSE(__dcgettext)
#else
-# define GETTEXT gettext__
-# define DCGETTEXT dcgettext__
+# define GETTEXT libintl_gettext
+# define DCGETTEXT libintl_dcgettext
#endif
/* Look up MSGID in the current default message catalog for the current
--- glibc-20021126/intl/gettextP.h.bak Mon Jul 29 14:31:01 2002
+++ glibc-20021126/intl/gettextP.h Wed Dec 11 15:25:06 2002
@@ -203,28 +211,33 @@
extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
const char *__codeset));
#else
-extern char *gettext__ PARAMS ((const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
- const char *__msgid));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
- const char *__msgid, int __category));
-extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2,
- unsigned long int __n));
-extern char *dngettext__ PARAMS ((const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- unsigned long int __n));
-extern char *dcngettext__ PARAMS ((const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- unsigned long int __n, int __category));
-extern char *dcigettext__ PARAMS ((const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- int __plural, unsigned long int __n,
- int __category));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
- const char *__dirname));
-extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname,
- const char *__codeset));
+extern char *libintl_gettext PARAMS ((const char *__msgid));
+extern char *libintl_dgettext PARAMS ((const char *__domainname,
+ const char *__msgid));
+extern char *libintl_dcgettext PARAMS ((const char *__domainname,
+ const char *__msgid, int __category));
+extern char *libintl_ngettext PARAMS ((const char *__msgid1,
+ const char *__msgid2,
+ unsigned long int __n));
+extern char *libintl_dngettext PARAMS ((const char *__domainname,
+ const char *__msgid1,
+ const char *__msgid2,
+ unsigned long int __n));
+extern char *libintl_dcngettext PARAMS ((const char *__domainname,
+ const char *__msgid1,
+ const char *__msgid2,
+ unsigned long int __n,
+ int __category));
+extern char *libintl_dcigettext PARAMS ((const char *__domainname,
+ const char *__msgid1,
+ const char *__msgid2,
+ int __plural, unsigned long int __n,
+ int __category));
+extern char *libintl_textdomain PARAMS ((const char *__domainname));
+extern char *libintl_bindtextdomain PARAMS ((const char *__domainname,
+ const char *__dirname));
+extern char *libintl_bind_textdomain_codeset PARAMS ((const char *__domainname,
+ const char *__codeset));
#endif
/* @@ begin of epilog @@ */
--- glibc-20021126/intl/ngettext.c.bak Sat May 4 00:00:00 2002
+++ glibc-20021126/intl/ngettext.c Wed Dec 11 15:34:09 2002
@@ -47,8 +47,8 @@
# define NGETTEXT __ngettext
# define DCNGETTEXT __dcngettext
#else
-# define NGETTEXT ngettext__
-# define DCNGETTEXT dcngettext__
+# define NGETTEXT libintl_ngettext
+# define DCNGETTEXT libintl_dcngettext
#endif
/* Look up MSGID in the current default message catalog for the current
--- glibc-20021126/intl/plural-exp.h.bak Thu Apr 4 20:11:22 2002
+++ glibc-20021126/intl/plural-exp.h Wed Dec 11 15:36:03 2002
@@ -95,10 +99,10 @@
# define GERMANIC_PLURAL __gettext_germanic_plural
# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
#elif defined (IN_LIBINTL)
-# define FREE_EXPRESSION gettext_free_exp__
-# define PLURAL_PARSE gettextparse__
-# define GERMANIC_PLURAL gettext_germanic_plural__
-# define EXTRACT_PLURAL_EXPRESSION gettext_extract_plural__
+# define FREE_EXPRESSION libintl_gettext_free_exp
+# define PLURAL_PARSE libintl_gettextparse
+# define GERMANIC_PLURAL libintl_gettext_germanic_plural
+# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
#else
# define FREE_EXPRESSION free_plural_expression
# define PLURAL_PARSE parse_plural_expression
--- glibc-20021126/intl/textdomain.c.bak Thu Apr 4 20:11:22 2002
+++ glibc-20021126/intl/textdomain.c Wed Dec 11 15:36:28 2002
@@ -45,8 +45,8 @@
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_default_domain libintl_nl_default_default_domain
+# define _nl_current_default_domain libintl_nl_current_default_domain
#endif
/* @@ end of prolog @@ */
@@ -68,7 +68,7 @@
# define strdup(str) __strdup (str)
# endif
#else
-# define TEXTDOMAIN textdomain__
+# define TEXTDOMAIN libintl_textdomain
#endif
/* Lock variable to protect the global data in the gettext implementation. */