Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / locale / C-collate.c

diff --git a/locale/C-collate.c b/locale/C-collate.c
index 964ea50113e1eb65add9f625f5cfd2bc51538445..6e395b69660361e20a98603faad1b058c7ec60e9 100644 (file)
--- a/locale/C-collate.c
+++ b/locale/C-collate.c
@@ -1,23 +1,23 @@
-/* Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <endian.h>
+#include <stdint.h>
 #include "localeinfo.h"
 
 static const char collseqmb[] =
@@ -98,50 +98,52 @@ static const uint32_t collseqwc[] =
   L'\xf8', L'\xf9', L'\xfa', L'\xfb', L'\xfc', L'\xfd', L'\xfe', L'\xff'
 };
 
-const struct locale_data _nl_C_LC_COLLATE =
+const struct __locale_data _nl_C_LC_COLLATE attribute_hidden =
 {
   _nl_C_name,
-  NULL, 0, 0, /* no file mapped */
+  NULL, 0, 0,                  /* no file mapped */
+  { NULL, },                   /* no cached data */
   UNDELETABLE,
   0,
-  NULL,
-  18,
+  19,
   {
     /* _NL_COLLATE_NRULES */
-    { word: 0 },
+    { .word = 0 },
     /* _NL_COLLATE_RULESETS */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_TABLEMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_WEIGHTMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_EXTRAMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_INDIRECTMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_GAP1 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_GAP2 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_GAP3 */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_TABLEWC */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_WEIGHTWC */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_EXTRAWC */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_INDIRECTWC */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_SYMB_HASH_SIZEMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_SYMB_TABLEMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_SYMB_EXTRAMB */
-    { string: NULL },
+    { .string = NULL },
     /* _NL_COLLATE_COLLSEQMB */
-    { string: collseqmb },
+    { .string = collseqmb },
     /* _NL_COLLATE_COLLSEQWC */
-    { string: (const char *) collseqwc }
+    { .string = (const char *) collseqwc },
+    /* _NL_COLLATE_CODESET */
+    { .string = _nl_C_codeset }
   }
 };