* wcsmbs/wchar.h (__wcstol_internal, __wcstoul_internal): Declare these

	 only when we will use them, under [__OPTIMIZE__ && __GNUC__ >= 2].
	(__wcstoll_internal, __wcstoull_internal_defined): Likewise.

diff --git a/ChangeLog b/ChangeLog
index d997178..d4d12f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-16  Roland McGrath  <roland@redhat.com>
+
+       * wcsmbs/wchar.h (__wcstol_internal, __wcstoul_internal): Declare these
+        only when we will use them, under [__OPTIMIZE__ && __GNUC__ >= 2].
+       (__wcstoll_internal, __wcstoull_internal_defined): Likewise.
+
 2006-03-06  Steven Munroe  <sjmunroe@us.ibm.com>
 
        * sysdeps/powerpc/powerpc32/fpu/fprsave.S: Add cfi_offset for spilling

diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 670dc79..5e4c717 100644 (file)
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -507,26 +507,30 @@ extern long double __wcstold_internal (__const wchar_t *__restrict __nptr,
                                       wchar_t **__restrict __endptr,
                                       int __group) __THROW;
 
-#ifndef __wcstol_internal_defined
+#if !defined __wcstol_internal_defined \
+    && defined __OPTIMIZE__ && __GNUC__ >= 2
 extern long int __wcstol_internal (__const wchar_t *__restrict __nptr,
                                   wchar_t **__restrict __endptr,
                                   int __base, int __group) __THROW;
 # define __wcstol_internal_defined     1
 #endif
-#ifndef __wcstoul_internal_defined
+#if !defined __wcstoul_internal_defined \
+    && defined __OPTIMIZE__ && __GNUC__ >= 2
 extern unsigned long int __wcstoul_internal (__const wchar_t *__restrict __npt,
                                             wchar_t **__restrict __endptr,
                                             int __base, int __group) __THROW;
 # define __wcstoul_internal_defined    1
 #endif
-#ifndef __wcstoll_internal_defined
+#if !defined __wcstoll_internal_defined \
+    && defined __OPTIMIZE__ && __GNUC__ >= 2
 __extension__
 extern long long int __wcstoll_internal (__const wchar_t *__restrict __nptr,
                                         wchar_t **__restrict __endptr,
                                         int __base, int __group) __THROW;
 # define __wcstoll_internal_defined    1
 #endif
-#ifndef __wcstoull_internal_defined
+#if !defined __wcstoull_internal_defined \
+    && defined __OPTIMIZE__ && __GNUC__ >= 2
 __extension__
 extern unsigned long long int __wcstoull_internal (__const wchar_t *
                                                   __restrict __nptr,