summaryrefslogtreecommitdiff
path: root/sysdeps/wordsize-64
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/wordsize-64')
-rw-r--r--sysdeps/wordsize-64/Dist4
-rw-r--r--sysdeps/wordsize-64/Makefile2
-rw-r--r--sysdeps/wordsize-64/inttypes.h81
-rw-r--r--sysdeps/wordsize-64/strtoimax.c28
-rw-r--r--sysdeps/wordsize-64/strtoumax.c28
-rw-r--r--sysdeps/wordsize-64/wcstoimax.c29
-rw-r--r--sysdeps/wordsize-64/wcstoumax.c29
7 files changed, 174 insertions, 27 deletions
diff --git a/sysdeps/wordsize-64/Dist b/sysdeps/wordsize-64/Dist
index 5661d79d1d..36bfb62e73 100644
--- a/sysdeps/wordsize-64/Dist
+++ b/sysdeps/wordsize-64/Dist
@@ -1 +1,5 @@
inttypes.h
+strtoimax.c
+strtoumax.c
+wcstoimax.c
+wcstoumax.c
diff --git a/sysdeps/wordsize-64/Makefile b/sysdeps/wordsize-64/Makefile
index 87ced71ec1..b22eaee177 100644
--- a/sysdeps/wordsize-64/Makefile
+++ b/sysdeps/wordsize-64/Makefile
@@ -1,3 +1,5 @@
ifeq ($(subdir),stdlib)
sysdep_headers += inttypes.h
+
+sysdep_routines += strtoimax strtoumax wcstoimax wcstoumax
endif
diff --git a/sysdeps/wordsize-64/inttypes.h b/sysdeps/wordsize-64/inttypes.h
index 5f11fc9cb1..c62d516c4b 100644
--- a/sysdeps/wordsize-64/inttypes.h
+++ b/sysdeps/wordsize-64/inttypes.h
@@ -373,53 +373,80 @@ typedef unsigned long int uint_fast64_t;
/* Macros for string conversion. */
/* Like `strtol' but convert to `intmax_t'. */
-#define strtoimax(nptr, endptr, base) \
- __strtol_internal (nptr, endptr, base, 0)
+extern intmax_t strtoimax __P ((__const char *__restrict __nptr,
+ char **__restrict __endptr, int __base));
-#ifndef __strtol_internal_defined
+/* Like `strtoul' but convert to `uintmax_t'. */
+extern uintmax_t strtoumax __P ((__const char * __restrict __nptr,
+ char ** __restrict __endptr, int __base));
+
+/* Like `wcstol' but convert to `intmax_t'. */
+extern intmax_t wcstoimax __P ((__const wchar_t * __restrict __nptr,
+ wchar_t **__restrict __endptr, int __base));
+
+/* Like `wcstoul' but convert to `uintmax_t'. */
+extern uintmax_t wcstoumax __P ((__const wchar_t * __restrict __nptr,
+ wchar_t ** __restrict __endptr, int __base));
+
+#if defined __GNUC__ && __GNUC__ >= 2 && defined __OPTIMIZE__
+
+/* Like `strtol' but convert to `intmax_t'. */
+# ifndef __strtol_internal_defined
extern long int __strtol_internal __P ((__const char *__restrict __nptr,
char **__restrict __endptr,
int __base, int __group));
-# define __strtol_internal_defined 1
-#endif
-
+# define __strtol_internal_defined 1
+# endif
+extern __inline intmax_t
+strtoimax (__const char *__restrict nptr, char **__restrict endptr, int base)
+{
+ return __strtol_internal (nptr, endptr, base, 0);
+}
/* Like `strtoul' but convert to `uintmax_t'. */
-#define strtoumax(nptr, endptr, base) \
- __strtoul_internal (nptr, endptr, base, 0)
-
-#ifndef __strtoul_internal_defined
+# ifndef __strtoul_internal_defined
extern unsigned long int __strtoul_internal __P ((__const char *
__restrict __nptr,
- char **__restrict __endptr,
+ char ** __restrict __endptr,
int __base, int __group));
-# define __strtoul_internal_defined 1
-#endif
-
+# define __strtoul_internal_defined 1
+# endif
+extern __inline uintmax_t
+strtoumax (__const char *__restrict nptr, char **__restrict endptr, int base)
+{
+ return __strtoul_internal (nptr, endptr, base, 0);
+}
/* Like `wcstol' but convert to `intmax_t'. */
-#define wcstoimax(nptr, endptr, base) \
- __wcstol_internal (nptr, endptr, base, 0)
-
-#ifndef __wcstol_internal_defined
-extern long int __wcstol_internal __P ((__const wchar_t *__restrict __nptr,
+# ifndef __wcstol_internal_defined
+extern long int __wcstol_internal __P ((__const wchar_t * __restrict __nptr,
wchar_t **__restrict __endptr,
int __base, int __group));
-# define __wcstol_internal_defined 1
-#endif
+# define __wcstol_internal_defined 1
+# endif
+extern __inline intmax_t
+wcstoimax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
+ int base)
+{
+ return __wcstol_internal (nptr, endptr, base, 0);
+}
/* Like `wcstoul' but convert to `uintmax_t'. */
-#define wcstoumax(nptr, endptr, base) \
- __wcstoul_internal (nptr, endptr, base, 0)
-
-#ifndef __wcstoul_internal_defined
+# ifndef __wcstoul_internal_defined
extern unsigned long int __wcstoul_internal __P ((__const wchar_t *
__restrict __nptr,
wchar_t **
__restrict __endptr,
int __base, int __group));
-# define __wcstoul_internal_defined 1
-#endif
+# define __wcstoul_internal_defined 1
+# endif
+extern __inline uintmax_t
+wcstoumax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
+ int base)
+{
+ return __wcstoul_internal (nptr, endptr, base, 0);
+}
+#endif /* GCC and Optimization. */
#endif /* inttypes.h */
diff --git a/sysdeps/wordsize-64/strtoimax.c b/sysdeps/wordsize-64/strtoimax.c
new file mode 100644
index 0000000000..f26f271b4d
--- /dev/null
+++ b/sysdeps/wordsize-64/strtoimax.c
@@ -0,0 +1,28 @@
+/* Convert string to maximal integer.
+ Copyright (C) 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <inttypes.h>
+#include <stdlib.h>
+
+intmax_t
+strtoimax (const char *__restrict nptr, char **__restrict endptr, int base)
+{
+ return __strtol_internal (nptr, endptr, base, 0);
+}
diff --git a/sysdeps/wordsize-64/strtoumax.c b/sysdeps/wordsize-64/strtoumax.c
new file mode 100644
index 0000000000..90d9be975c
--- /dev/null
+++ b/sysdeps/wordsize-64/strtoumax.c
@@ -0,0 +1,28 @@
+/* Convert string to maximal unsigned integer.
+ Copyright (C) 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <inttypes.h>
+#include <stdlib.h>
+
+uintmax_t
+strtoumax (const char *__restrict nptr, char **__restrict endptr, int base)
+{
+ return __strtoul_internal (nptr, endptr, base, 0);
+}
diff --git a/sysdeps/wordsize-64/wcstoimax.c b/sysdeps/wordsize-64/wcstoimax.c
new file mode 100644
index 0000000000..d6d992bba7
--- /dev/null
+++ b/sysdeps/wordsize-64/wcstoimax.c
@@ -0,0 +1,29 @@
+/* Convert wide-character string to maximal integer.
+ Copyright (C) 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <inttypes.h>
+#include <wchar.h>
+
+intmax_t
+wcstoimax (const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
+ int base)
+{
+ return __wcstol_internal (nptr, endptr, base, 0);
+}
diff --git a/sysdeps/wordsize-64/wcstoumax.c b/sysdeps/wordsize-64/wcstoumax.c
new file mode 100644
index 0000000000..c2065258ac
--- /dev/null
+++ b/sysdeps/wordsize-64/wcstoumax.c
@@ -0,0 +1,29 @@
+/* Convert wide-character string to maximal unsigned integer.
+ Copyright (C) 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <inttypes.h>
+#include <wchar.h>
+
+uintmax_t
+wcstoumax (const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
+ int base)
+{
+ return __wcstoul_internal (nptr, endptr, base, 0);
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 07:39:40 +0000