about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-09 21:07:26 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-09 21:07:26 +0000
commitc3d6c951998a1687ad462bdd5e9bcbb691e1db8a (patch)
treef68ed102140421bee9eacef406ee1d4fd4d18346
parentff44f2a57a9442d86e7c40975a3cd45a3ff7de72 (diff)
downloadglibc-c3d6c951998a1687ad462bdd5e9bcbb691e1db8a.tar.gz
glibc-c3d6c951998a1687ad462bdd5e9bcbb691e1db8a.tar.xz
glibc-c3d6c951998a1687ad462bdd5e9bcbb691e1db8a.zip
Update.
	* stdlib/strtof_l.c: Declare ____strtoull_l_internal.
	* stdlib/strtod_l.c: Likewise.
	* stdlib/strtold_l.c: Likewise.

	* intl/gettextP.h [_LIBC] (SWAP): Use byteswap.h macros.
-rw-r--r--ChangeLog6
-rw-r--r--intl/gettextP.h5
-rw-r--r--stdlib/strtod_l.c4
-rw-r--r--stdlib/strtof_l.c4
-rw-r--r--stdlib/strtold_l.c4
5 files changed, 20 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 644b500a7e..2464b22a94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 1998-04-09  Ulrich Drepper  <drepper@cygnus.com>
 
+	* stdlib/strtof_l.c: Declare ____strtoull_l_internal.
+	* stdlib/strtod_l.c: Likewise.
+	* stdlib/strtold_l.c: Likewise.
+
+	* intl/gettextP.h [_LIBC] (SWAP): Use byteswap.h macros.
+
 	* sysdeps/i386/i486/bits/string.h: Remove unused variables.
 
 	* misc/syslog.c (closelog_internal): Set LogTag to NULL.
diff --git a/intl/gettextP.h b/intl/gettextP.h
index fd2547b2c7..bcbe2720a7 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -41,6 +41,10 @@
 #endif
 
 
+#ifdef _LIBC
+# include <byteswap.h>
+# define SWAP(i) bswap_32 (i)
+#else
 static nls_uint32 SWAP PARAMS ((nls_uint32 i));
 
 static inline nls_uint32
@@ -49,6 +53,7 @@ SWAP (i)
 {
   return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
 }
+#endif
 
 
 struct loaded_domain
diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
index 451168fce4..2f40a30ec2 100644
--- a/stdlib/strtod_l.c
+++ b/stdlib/strtod_l.c
@@ -1,5 +1,5 @@
 /* Convert string representing a number to float value, using given locale.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -23,5 +23,7 @@
 #include <xlocale.h>
 
 extern double ____strtod_l_internal (const char *, char **, int, __locale_t);
+extern unsigned long long int ____strtoull_l_internal (const char *, char **,
+						       int, int, __locale_t);
 
 #include <strtod.c>
diff --git a/stdlib/strtof_l.c b/stdlib/strtof_l.c
index 67f1360cbd..6e3f960525 100644
--- a/stdlib/strtof_l.c
+++ b/stdlib/strtof_l.c
@@ -1,5 +1,5 @@
 /* Convert string representing a number to float value, using given locale.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -23,5 +23,7 @@
 #include <xlocale.h>
 
 extern float ____strtof_l_internal (const char *, char **, int, __locale_t);
+extern unsigned long long int ____strtoull_l_internal (const char *, char **,
+						       int, int, __locale_t);
 
 #include <strtof.c>
diff --git a/stdlib/strtold_l.c b/stdlib/strtold_l.c
index 8f2fe3274d..2a1f1f5054 100644
--- a/stdlib/strtold_l.c
+++ b/stdlib/strtold_l.c
@@ -1,5 +1,5 @@
 /* Convert string representing a number to float value, using given locale.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -24,5 +24,7 @@
 
 extern long double ____strtold_l_internal (const char *, char **, int,
 					   __locale_t);
+extern unsigned long long int ____strtoull_l_internal (const char *, char **,
+						       int, int, __locale_t);
 
 #include <strtold.c>