about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-28 06:59:14 +0000
committerRoland McGrath <roland@gnu.org>2002-08-28 06:59:14 +0000
commita5cc88e5d05e4d7b1c2ead2ac7f9acf0bf7699aa (patch)
tree596845e426b227f5a08015dc78d4af2b43db68ec
parentf0377954d7c324c0fe320eb1ca22ea46837e9da3 (diff)
downloadglibc-a5cc88e5d05e4d7b1c2ead2ac7f9acf0bf7699aa.tar.gz
glibc-a5cc88e5d05e4d7b1c2ead2ac7f9acf0bf7699aa.tar.xz
glibc-a5cc88e5d05e4d7b1c2ead2ac7f9acf0bf7699aa.zip
2002-08-27 Roland McGrath <roland@redhat.com>
	* locale/locale.h (__newlocale, __duplocale, __freelocale,
	__uselocale): Don't declare these any more.
	* include/locale.h (__uselocale): Declare here instead, using __typeof.
-rw-r--r--include/locale.h2
-rw-r--r--locale/locale.h5
2 files changed, 2 insertions, 5 deletions
diff --git a/include/locale.h b/include/locale.h
index b339953a93..22770b9ad2 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -1,6 +1,8 @@
 #ifndef	_LOCALE_H
 #include <locale/locale.h>
 
+extern __typeof (uselocale) __uselocale;
+
 libc_hidden_proto (setlocale)
 
 /* This has to be changed whenever a new locale is defined.  */
diff --git a/locale/locale.h b/locale/locale.h
index c84eb01e8b..57acb62cd0 100644
--- a/locale/locale.h
+++ b/locale/locale.h
@@ -146,8 +146,6 @@ typedef __locale_t locale_t;
    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,
-			       __locale_t __base) __THROW;
 extern __locale_t newlocale (int __category_mask, __const char *__locale,
 			     __locale_t __base) __THROW;
 
@@ -183,12 +181,10 @@ extern __locale_t newlocale (int __category_mask, __const char *__locale,
 
 /* Return a duplicate of the set of locale in DATASET.  All usage
    counters are increased if necessary.  */
-extern __locale_t __duplocale (__locale_t __dataset) __THROW;
 extern __locale_t duplocale (__locale_t __dataset) __THROW;
 
 /* Free the data associated with a locale dataset previously returned
    by a call to `setlocale_r'.  */
-extern void __freelocale (__locale_t __dataset) __THROW;
 extern void freelocale (__locale_t __dataset) __THROW;
 
 /* Switch the current thread's locale to DATASET.
@@ -196,7 +192,6 @@ extern void freelocale (__locale_t __dataset) __THROW;
    The special value LC_GLOBAL_LOCALE is the initial setting
    for all threads and can also be installed any time, meaning
    the thread uses the global settings controlled by `setlocale'.  */
-extern __locale_t __uselocale (__locale_t __dataset) __THROW;
 extern __locale_t uselocale (__locale_t __dataset) __THROW;
 
 /* This value can be passed to `uselocale' and may be returned by it.