summary refs log tree commit diff
path: root/locale/setlocale.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-24 05:42:34 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-24 05:42:34 +0000
commit575b273bdc8b2fe0be70396486e9fbc400b2e641 (patch)
tree6df0b1bb75edc18a3786b5f7fe470ac7bce3ea73 /locale/setlocale.c
parent46fd4f671c45b70909e03160aa4568db5f6c8556 (diff)
downloadglibc-575b273bdc8b2fe0be70396486e9fbc400b2e641.tar.gz
glibc-575b273bdc8b2fe0be70396486e9fbc400b2e641.tar.xz
glibc-575b273bdc8b2fe0be70396486e9fbc400b2e641.zip
Update.
1999-12-23  Ulrich Drepper  <drepper@cygnus.com>

	* locale/en_BW: New file.
	* locale/en_ZW: New file.
	Contributed by Schalk W. Cronjé <schalkc@ntaba.co.za>.

	Contributed by Schalk W. Cronjé <schalkc@ntaba.co.za>.
Diffstat (limited to 'locale/setlocale.c')
-rw-r--r--locale/setlocale.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 8f40520c6e..1fdc94ff5b 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -307,13 +307,6 @@ setlocale (int category, const char *locale)
       while (category-- > 0)
 	if (category != LC_ALL)
 	  {
-	    /* XXX hack.  Remove when collation works.  */
-	    if (category == LC_COLLATE)
-	      {
-		newdata[category] = NULL;
-		continue;
-	      }
-
 	    newdata[category] = _nl_find_locale (locale_path, locale_path_len,
 						 category,
 						 &newnames[category]);
@@ -350,11 +343,6 @@ setlocale (int category, const char *locale)
 
       return composite;
     }
-  else if (category == LC_COLLATE)
-    {
-      /* XXX Remove when LC_COLLATE works.  */
-      return NULL;
-    }
   else
     {
       struct locale_data *newdata = NULL;