(addinitgroupsX): Move any_success decl before first goto out.
[kopensolaris-gnu/glibc.git] / locale / xlocale.c
index cad5b95..4573e6f 100644 (file)
@@ -1,5 +1,5 @@
 /* C locale object.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
 
@@ -32,41 +32,24 @@ extern const char _nl_C_LC_CTYPE_toupper[] attribute_hidden;
 extern const char _nl_C_LC_CTYPE_tolower[] attribute_hidden;
 
 
-#define NL_C_INITIALIZER                                                     \
-  {                                                                          \
-    .__locales =                                                             \
-    {                                                                        \
-      [LC_CTYPE] = &_nl_C_LC_CTYPE,                                          \
-      [LC_NUMERIC] = &_nl_C_LC_NUMERIC,                                              \
-      [LC_TIME] = &_nl_C_LC_TIME,                                            \
-      [LC_COLLATE] = &_nl_C_LC_COLLATE,                                              \
-      [LC_MONETARY] = &_nl_C_LC_MONETARY,                                    \
-      [LC_MESSAGES] = &_nl_C_LC_MESSAGES,                                    \
-      [LC_PAPER] = &_nl_C_LC_PAPER,                                          \
-      [LC_NAME] = &_nl_C_LC_NAME,                                            \
-      [LC_ADDRESS] = &_nl_C_LC_ADDRESS,                                              \
-      [LC_TELEPHONE] = &_nl_C_LC_TELEPHONE,                                  \
-      [LC_MEASUREMENT] = &_nl_C_LC_MEASUREMENT,                                      \
-      [LC_IDENTIFICATION] = &_nl_C_LC_IDENTIFICATION                         \
-    },                                                                       \
-    .__ctype_b = (const unsigned short int *) _nl_C_LC_CTYPE_class + 128,     \
-    .__ctype_tolower = (const int *) _nl_C_LC_CTYPE_tolower + 128,           \
-    .__ctype_toupper = (const int *) _nl_C_LC_CTYPE_toupper + 128            \
-  }
-
-struct __locale_struct _nl_C_locobj attribute_hidden = NL_C_INITIALIZER;
-
-#ifdef SHARED
-struct __locale_struct _nl_global_locale attribute_hidden = NL_C_INITIALIZER;
-
-# if USE_TLS && HAVE___THREAD
-/* The tsd macros don't permit an initializer.  */
-__thread void *__libc_tsd_LOCALE = &_nl_global_locale;
-# else
-__libc_tsd_define (, LOCALE)
-/* This is a bad kludge presuming the variable name used by the macros.
-   Using typeof makes sure to barf if we do not match the macro definition.  */
-__typeof (__libc_tsd_LOCALE) __libc_tsd_LOCALE = &_nl_global_locale;
-# endif
-
-#endif
+const struct __locale_struct _nl_C_locobj attribute_hidden =
+  {
+    .__locales =
+    {
+#define DEFINE_CATEGORY(category, category_name, items, a) \
+      [category] = &_nl_C_##category,
+#include "categories.def"
+#undef DEFINE_CATEGORY
+    },
+    .__names =
+    {
+      [LC_ALL] = _nl_C_name,
+#define DEFINE_CATEGORY(category, category_name, items, a) \
+      [category] = _nl_C_name,
+#include "categories.def"
+#undef DEFINE_CATEGORY
+    },
+    .__ctype_b = (const unsigned short int *) _nl_C_LC_CTYPE_class + 128,
+    .__ctype_tolower = (const int *) _nl_C_LC_CTYPE_tolower + 128,
+    .__ctype_toupper = (const int *) _nl_C_LC_CTYPE_toupper + 128
+  };