Added a test for the FILTER command

[pspp] / intl / bindtextdom.c

diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 250f5e863b19491cd558804c19fa0e41a5d381ba..d582ce11d51f4044f1d5198d998046f96a99b1ef 100644 (file)
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -58,11 +58,6 @@
 
 /* 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
-#endif
 
 /* List with bindings of specific domains.  */
 extern struct binding *_nl_domain_bindings;
@@ -151,8 +146,8 @@ set_binding_values (domainname, dirnamep, codesetp)
              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
@@ -167,7 +162,7 @@ set_binding_values (domainname, dirnamep, codesetp)
 
                  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;
@@ -221,7 +216,7 @@ set_binding_values (domainname, dirnamep, codesetp)
     {
       /* Simply return the default values.  */
       if (dirnamep)
-       *dirnamep = INTUSE(_nl_default_dirname);
+       *dirnamep = _nl_default_dirname;
       if (codesetp)
        *codesetp = NULL;
     }
@@ -243,11 +238,11 @@ set_binding_values (domainname, dirnamep, codesetp)
 
          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;
@@ -270,7 +265,7 @@ set_binding_values (domainname, dirnamep, codesetp)
        }
       else
        /* The default value.  */
-       new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
+       new_binding->dirname = (char *) _nl_default_dirname;
 
       new_binding->codeset_cntr = 0;
 
@@ -326,7 +321,7 @@ set_binding_values (domainname, dirnamep, codesetp)
       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);