glibc 2005-02-16 Roland McGrath <roland@redhat.com>

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 0e4474a971c8b5977a305b7fdcf5239c5579fa1c..17ba1763432992c55e2fc6e7af24eace339c214b 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-16  Roland McGrath  <roland@redhat.com>
+
+       * dcigettext.c (_nl_find_msg): Add a cast.
+
+       * dcigettext.c (INTVARDEF, INTUSE): Macros removed.
+       (_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
+       (libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
+       * bindtextdom.c (INTUSE): Macro removed.
+       (_nl_default_dirname): Use libc_hidden_proto.
+       (set_binding_values): Don't use INTUSE.
+
 2005-05-05  Bruno Haible  <bruno@clisp.org>
 
        * dcigettext.c (__libc_rwlock_wrlock): Define fallback.

diff --git a/gettext-runtime/intl/bindtextdom.c b/gettext-runtime/intl/bindtextdom.c
index f748528e6f8e591dfa6553ca2195784b4ec8688b..95069804531ef07b86bd70f5989bdcbca5572077 100644 (file)
--- a/gettext-runtime/intl/bindtextdom.c
+++ b/gettext-runtime/intl/bindtextdom.c
@@ -59,9 +59,7 @@
 /* Contains the default location of the message catalogs.  */
 extern const char _nl_default_dirname[];
 #ifdef _LIBC
-extern const char _nl_default_dirname_internal[] attribute_hidden;
-#else
-# define INTUSE(name) name
+libc_hidden_proto (_nl_default_dirname)
 #endif
 
 /* List with bindings of specific domains.  */
@@ -144,8 +142,8 @@ set_binding_values (const char *domainname,
              char *result = binding->dirname;
              if (strcmp (dirname, result) != 0)
                {
-                 if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
-                   result = (char *) INTUSE(_nl_default_dirname);
+                 if (strcmp (dirname, _nl_default_dirname) == 0)
+                   result = (char *) _nl_default_dirname;
                  else
                    {
 #if defined _LIBC || defined HAVE_STRDUP
@@ -160,7 +158,7 @@ set_binding_values (const char *domainname,
 
                  if (__builtin_expect (result != NULL, 1))
                    {
-                     if (binding->dirname != INTUSE(_nl_default_dirname))
+                     if (binding->dirname != _nl_default_dirname)
                        free (binding->dirname);
 
                      binding->dirname = result;
@@ -213,7 +211,7 @@ set_binding_values (const char *domainname,
     {
       /* Simply return the default values.  */
       if (dirnamep)
-       *dirnamep = INTUSE(_nl_default_dirname);
+       *dirnamep = _nl_default_dirname;
       if (codesetp)
        *codesetp = NULL;
     }
@@ -235,11 +233,11 @@ set_binding_values (const char *domainname,
 
          if (dirname == NULL)
            /* The default value.  */
-           dirname = INTUSE(_nl_default_dirname);
+           dirname = _nl_default_dirname;
          else
            {
-             if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
-               dirname = INTUSE(_nl_default_dirname);
+             if (strcmp (dirname, _nl_default_dirname) == 0)
+               dirname = _nl_default_dirname;
              else
                {
                  char *result;
@@ -262,7 +260,7 @@ set_binding_values (const char *domainname,
        }
       else
        /* The default value.  */
-       new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
+       new_binding->dirname = (char *) _nl_default_dirname;
 
       if (codesetp)
        {
@@ -315,7 +313,7 @@ set_binding_values (const char *domainname,
       if (0)
        {
        failed_codeset:
-         if (new_binding->dirname != INTUSE(_nl_default_dirname))
+         if (new_binding->dirname != _nl_default_dirname)
            free (new_binding->dirname);
        failed_dirname:
          free (new_binding);

diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index 738b12b5f54c56b766db42e72215643373401033..c56ac3a10c50339d7a932184327957fd344ba236 100644 (file)
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -298,13 +298,6 @@ transcmp (const void *p1, const void *p2)
 }
 #endif
 
-#ifndef INTVARDEF
-# define INTVARDEF(name)
-#endif
-#ifndef INTUSE
-# define INTUSE(name) name
-#endif
-
 /* Name of the default domain used for gettext(3) prior any call to
    textdomain(3).  The default value for this is "messages".  */
 const char _nl_default_default_domain[] attribute_hidden = "messages";
@@ -317,8 +310,14 @@ const char *_nl_current_default_domain attribute_hidden
 #if defined __EMX__
 extern const char _nl_default_dirname[];
 #else
+# ifdef _LIBC
+extern const char _nl_default_dirname[];
+libc_hidden_proto (_nl_default_dirname)
+# endif
 const char _nl_default_dirname[] = LOCALEDIR;
-INTVARDEF (_nl_default_dirname)
+# ifdef _LIBC
+libc_hidden_data_def (_nl_default_dirname)
+# endif
 #endif
 
 /* List with bindings of specific domains created by bindtextdomain()
@@ -581,7 +580,7 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
     }
 
   if (binding == NULL)
-    dirname = (char *) INTUSE(_nl_default_dirname);
+    dirname = (char *) _nl_default_dirname;
   else if (IS_ABSOLUTE_PATH (binding->dirname))
     dirname = binding->dirname;
   else
@@ -1121,7 +1120,7 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
                      goto converted;
                    }
 
-                 inbuf = result;
+                 inbuf = (const unsigned char *) result;
 # else
 #  if HAVE_ICONV
                  const char *inptr = (const char *) inbuf;
@@ -1189,7 +1188,7 @@ _nl_find_msg (struct loaded_l10nfile *domain_file,
                  newmem->next = transmem_list;
                  transmem_list = newmem;
 
-                 freemem = newmem->data;
+                 freemem = (unsigned char *) newmem->data;
                  freemem_size -= offsetof (struct transmem_list, data);
 # else
                  transmem_list = newmem;
@@ -1505,7 +1504,7 @@ libc_freeres_fn (free_mem)
     {
       struct binding *oldp = _nl_domain_bindings;
       _nl_domain_bindings = _nl_domain_bindings->next;
-      if (oldp->dirname != INTUSE(_nl_default_dirname))
+      if (oldp->dirname != _nl_default_dirname)
        /* Yes, this is a pointer comparison.  */
        free (oldp->dirname);
       free (oldp->codeset);