Update.

2002-08-08  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/wordsize-64/wcstol_l.c (wcstoll_l): Define to something
	else and undefine after including wcstol_l.c.
	* sysdeps/wordsize-64/wcstoul_l.c (wcstoull_l): Similarly.

diff --git a/ChangeLog b/ChangeLog
index a7a4558..803fa61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-08  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/wordsize-64/wcstol_l.c (wcstoll_l): Define to something
+       else and undefine after including wcstol_l.c.
+       * sysdeps/wordsize-64/wcstoul_l.c (wcstoull_l): Similarly.
+
 2002-08-08  Ulrich Drepper  <drepper@redhat.com>
 
        * gmon/gmon.c (write_gmon): Use O_NOFOLLOW in open calls if available.

diff --git a/sysdeps/wordsize-64/wcstol_l.c b/sysdeps/wordsize-64/wcstol_l.c
index 57fb641..fe81147 100644 (file)
--- a/sysdeps/wordsize-64/wcstol_l.c
+++ b/sysdeps/wordsize-64/wcstol_l.c
@@ -1,11 +1,13 @@
 /* We have to irritate the compiler a bit.  */
 #define ____wcstoll_l_internal ____wcstoll_l_internal_XXX
-#define __wcstoll_l __wcstoll_l_XXX
+#define __wcstoll_l ___wcstoll_l_XXX
+#define wcstoll_l __wcstoll_l_XX
 
 #include <sysdeps/generic/wcstol_l.c>
 
 #undef ____wcstoll_l_internal
 #undef __wcstoll_l
+#undef wcstoll_l
 strong_alias (____wcstol_l_internal, ____wcstoll_l_internal)
 weak_alias (__wcstol_l, __wcstoll_l)
 weak_alias (__wcstol_l, wcstoll_l)

diff --git a/sysdeps/wordsize-64/wcstoul_l.c b/sysdeps/wordsize-64/wcstoul_l.c
index f9b34d4..d13bd5b 100644 (file)
--- a/sysdeps/wordsize-64/wcstoul_l.c
+++ b/sysdeps/wordsize-64/wcstoul_l.c
@@ -1,11 +1,13 @@
 /* We have to irritate the compiler a bit.  */
 #define ____wcstoull_l_internal ____wcstoull_l_internal_XXX
-#define __wcstoull_l __wcstoull_l_XXX
+#define __wcstoull_l ___wcstoull_l_XXX
+#define wcstoull_l __wcstoull_l_XXX
 
 #include <sysdeps/generic/wcstoul_l.c>
 
 #undef ____wcstoull_l_internal
 #undef __wcstoull_l
+#undef wcstoull_l
 strong_alias (____wcstoul_l_internal, ____wcstoull_l_internal)
 weak_alias (__wcstoul_l, __wcstoull_l)
 weak_alias (__wcstoul_l, wcstoull_l)