summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-07 23:57:22 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-07 23:57:22 -0500
commita784e502472fb3a1afa4d01a47c66b52d23e00f6 (patch)
tree5ebaa084119dcffe41671a62e2e799b172c57d24 /locale
parent33808bf1164be2e7c8535bdd5ac398c75c33ed49 (diff)
downloadglibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.tar.gz
Remove pre-ISO C support
No more __const.
Diffstat (limited to 'locale')
-rw-r--r--locale/lc-ctype.c8
-rw-r--r--locale/locale.h7
2 files changed, 8 insertions, 7 deletions
diff --git a/locale/lc-ctype.c b/locale/lc-ctype.c
index f2530afe5c..95d35a4947 100644
--- a/locale/lc-ctype.c
+++ b/locale/lc-ctype.c
@@ -1,5 +1,5 @@
/* Define current locale data for LC_CTYPE category.
- Copyright (C) 1995,1996,1997,1998,1999,2000,2002,2003,2005,2008
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2002,2003,2005,2008,2012
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -79,9 +79,9 @@ _nl_postload_ctype (void)
/* We must use the exported names to access these so we are sure to
be accessing the main executable's copy if it has COPY relocs. */
- extern __const unsigned short int *__ctype_b; /* Characteristics. */
- extern __const __int32_t *__ctype_tolower; /* Case conversions. */
- extern __const __int32_t *__ctype_toupper; /* Case conversions. */
+ extern const unsigned short int *__ctype_b; /* Characteristics. */
+ extern const __int32_t *__ctype_tolower; /* Case conversions. */
+ extern const __int32_t *__ctype_toupper; /* Case conversions. */
extern const uint32_t *__ctype32_b;
extern const uint32_t *__ctype32_toupper;
diff --git a/locale/locale.h b/locale/locale.h
index 2aa19e76ac..7341b47429 100644
--- a/locale/locale.h
+++ b/locale/locale.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1992,1995-2002,2007,2009 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995-2002,2007,2009,2012
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -122,7 +123,7 @@ struct lconv
/* Set and/or return the current locale. */
-extern char *setlocale (int __category, __const char *__locale) __THROW;
+extern char *setlocale (int __category, const char *__locale) __THROW;
/* Return the numeric/monetary information for the current locale. */
extern struct lconv *localeconv (void) __THROW;
@@ -149,7 +150,7 @@ __END_NAMESPACE_STD
datasets. Unlike for the CATEGORY parameter for `setlocale' the
CATEGORY_MASK parameter here uses a single bit for each category,
made by OR'ing together LC_*_MASK bits above. */
-extern __locale_t newlocale (int __category_mask, __const char *__locale,
+extern __locale_t newlocale (int __category_mask, const char *__locale,
__locale_t __base) __THROW;
/* These are the bits that can be set in the CATEGORY_MASK argument to