Imported Debian patch 0.9.6+really0.9.3-0.1debian/0.9.6+really0.9.3-0.1

1 files changed, 5 insertions, 36 deletions

diff --git a/tests/test-locale.c b/tests/test-locale.c
index 5383cff4..2e5c4fc8 100644
--- a/tests/test-locale.c
+++ b/tests/test-locale.c
@@ -1,5 +1,5 @@
 /* Test of <locale.h> substitute.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 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
@@ -33,9 +33,10 @@ int a[] =
     LC_TIME
   };
 
-/* Check that the 'struct lconv' type is defined.  */
-struct lconv l;
-int ls;
+#if HAVE_NEWLOCALE
+/* Check that the locale_t type and the LC_GLOBAL_LOCALE macro are defined.  */
+locale_t b = LC_GLOBAL_LOCALE;
+#endif
 
 /* Check that NULL can be passed through varargs as a pointer type,
    per POSIX 2008.  */
@@ -44,37 +45,5 @@ verify (sizeof NULL == sizeof (void *));
 int
 main ()
 {
-#if HAVE_NEWLOCALE
-  /* Check that the locale_t type and the LC_GLOBAL_LOCALE macro are defined.  */
-  locale_t b = LC_GLOBAL_LOCALE;
-  (void) b;
-#endif
-
-  /* Check that 'struct lconv' has the ISO C and POSIX specified members.  */
-  ls += sizeof (*l.decimal_point);
-  ls += sizeof (*l.thousands_sep);
-  ls += sizeof (*l.grouping);
-  ls += sizeof (*l.mon_decimal_point);
-  ls += sizeof (*l.mon_thousands_sep);
-  ls += sizeof (*l.mon_grouping);
-  ls += sizeof (*l.positive_sign);
-  ls += sizeof (*l.negative_sign);
-  ls += sizeof (*l.currency_symbol);
-  ls += sizeof (l.frac_digits);
-  ls += sizeof (l.p_cs_precedes);
-  ls += sizeof (l.p_sign_posn);
-  ls += sizeof (l.p_sep_by_space);
-  ls += sizeof (l.n_cs_precedes);
-  ls += sizeof (l.n_sign_posn);
-  ls += sizeof (l.n_sep_by_space);
-  ls += sizeof (*l.int_curr_symbol);
-  ls += sizeof (l.int_frac_digits);
-  ls += sizeof (l.int_p_cs_precedes);
-  ls += sizeof (l.int_p_sign_posn);
-  ls += sizeof (l.int_p_sep_by_space);
-  ls += sizeof (l.int_n_cs_precedes);
-  ls += sizeof (l.int_n_sign_posn);
-  ls += sizeof (l.int_n_sep_by_space);
-
   return 0;
 }