about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-03-16 22:11:04 +0000
committerRoland McGrath <roland@gnu.org>2006-03-16 22:11:04 +0000
commit27c0e0d8630de8efbbd633ffb425c85515a5e89d (patch)
tree036075932c5e84d97b6de016cd794b12571c8e16
parent3e7e947f6bf0bc21f94e6cef4fd7cd19ff77b9eb (diff)
downloadglibc-27c0e0d8630de8efbbd633ffb425c85515a5e89d.tar.gz
glibc-27c0e0d8630de8efbbd633ffb425c85515a5e89d.tar.xz
glibc-27c0e0d8630de8efbbd633ffb425c85515a5e89d.zip
* 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.
-rw-r--r--ChangeLog6
-rw-r--r--wcsmbs/wchar.h12
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d997178d46..d4d12f172a 100644
--- 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 670dc79c4a..5e4c717904 100644
--- 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,