X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fhard-locale.c;h=26e614b74b47a57d676458f312709ed07d2ea990;hb=1b42459c6b378bdcca609417e2ae4b686556be1a;hp=25e66bce3a27a4a23ca82a497302a9eee8a9ad56;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/hard-locale.c b/lib/hard-locale.c
index 25e66bce3..26e614b74 100644
--- a/lib/hard-locale.c
+++ b/lib/hard-locale.c
@@ -1,7 +1,7 @@
 /* hard-locale.c -- Determine whether a locale is hard.
 
-   Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, 2006, 2007 Free
-   Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2011 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@
 
 #ifdef __GLIBC__
 # define GLIBC_VERSION __GLIBC__
+#elif defined __UCLIBC__
+# define GLIBC_VERSION 2
 #else
 # define GLIBC_VERSION 0
 #endif
@@ -41,29 +43,29 @@ hard_locale (int category)
   if (p)
     {
       if (2 <= GLIBC_VERSION)
-	{
-	  if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
-	    hard = false;
-	}
+        {
+          if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+            hard = false;
+        }
       else
-	{
-	  char *locale = strdup (p);
-	  if (locale)
-	    {
-	      /* Temporarily set the locale to the "C" and "POSIX" locales
-		 to find their names, so that we can determine whether one
-		 or the other is the caller's locale.  */
-	      if (((p = setlocale (category, "C"))
-		   && strcmp (p, locale) == 0)
-		  || ((p = setlocale (category, "POSIX"))
-		      && strcmp (p, locale) == 0))
-		hard = false;
+        {
+          char *locale = strdup (p);
+          if (locale)
+            {
+              /* Temporarily set the locale to the "C" and "POSIX" locales
+                 to find their names, so that we can determine whether one
+                 or the other is the caller's locale.  */
+              if (((p = setlocale (category, "C"))
+                   && strcmp (p, locale) == 0)
+                  || ((p = setlocale (category, "POSIX"))
+                      && strcmp (p, locale) == 0))
+                hard = false;
 
-	      /* Restore the caller's locale.  */
-	      setlocale (category, locale);
-	      free (locale);
-	    }
-	}
+              /* Restore the caller's locale.  */
+              setlocale (category, locale);
+              free (locale);
+            }
+        }
     }
 
   return hard;