diff options
| -rw-r--r-- | ChangeLog | 26 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/wcstol.c (renamed from wcsmbs/wcstol.c) | 0 | ||||
| -rw-r--r-- | sysdeps/generic/wcstol_l.c (renamed from wcsmbs/wcstol_l.c) | 0 | ||||
| -rw-r--r-- | sysdeps/generic/wcstoll.c (renamed from wcsmbs/wcstoll.c) | 0 | ||||
| -rw-r--r-- | sysdeps/generic/wcstoll_l.c (renamed from wcsmbs/wcstoll_l.c) | 0 | ||||
| -rw-r--r-- | sysdeps/generic/wcstoul.c (renamed from wcsmbs/wcstoul.c) | 0 | ||||
| -rw-r--r-- | sysdeps/generic/wcstoul_l.c (renamed from wcsmbs/wcstoul_l.c) | 0 | ||||
| -rw-r--r-- | sysdeps/generic/wcstoull.c (renamed from wcsmbs/wcstoull.c) | 0 | ||||
| -rw-r--r-- | sysdeps/generic/wcstoull_l.c (renamed from wcsmbs/wcstoull_l.c) | 0 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/wcstol.c | 10 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/wcstol_l.c | 10 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/wcstoll.c | 1 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/wcstoll_l.c | 1 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/wcstoul.c | 10 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/wcstoul_l.c | 10 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/wcstoull.c | 1 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/wcstoull_l.c | 1 |
18 files changed, 72 insertions, 2 deletions
@@ -33,6 +33,32 @@ * sysdeps/wordexp-64/strtoll_l.c: New file. * sysdeps/wordexp-64/strtoull_l.c: New file. + * wcsmbs/wcstol.c: Moved to ... + * sysdeps/generic/wcstol.c: ...here. + * wcsmbs/wcstoul.c: Moved to ... + * sysdeps/generic/wcstoul.c: ...here. + * wcsmbs/wcstoll.c: Moved to ... + * sysdeps/generic/wcstoll.c: ...here. + * wcsmbs/wcstoull.c: Moved to ... + * sysdeps/generic/wcstoull.c: ...here. + * wcsmbs/wcstol_l.c: Moved to ... + * sysdeps/generic/wcstol_l.c: ...here. + * wcsmbs/wcstoul_l.c: Moved to ... + * sysdeps/generic/wcstoul_l.c: ...here. + * wcsmbs/wcstoll_l.c: Moved to ... + * sysdeps/generic/wcstoll_l.c: ...here. + * wcsmbs/wcstoull_l.c: Moved to ... + * sysdeps/generic/wcstoull_l.c: ...here. + + * sysdeps/wordexp-64/wcstol.c: New file. + * sysdeps/wordexp-64/wcstoul.c: New file. + * sysdeps/wordexp-64/wcstoll.c: New file. + * sysdeps/wordexp-64/wcstoull.c: New file. + * sysdeps/wordexp-64/wcstol_l.c: New file. + * sysdeps/wordexp-64/wcstoul_l.c: New file. + * sysdeps/wordexp-64/wcstoll_l.c: New file. + * sysdeps/wordexp-64/wcstoull_l.c: New file. + 1999-05-24 Jakub Jelinek <jj@ultra.linux.cz> * sysdeps/sparc/bits/wordsize.h: New file. diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 1dbfc53ec9..a5f6f4e4b0 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -446,7 +446,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) { /* A double `l' is equivalent to an `L'. */ ++f; - flags |= need_longlong ? LONGDBL | LONG; + flags |= need_longlong ? LONGDBL : LONG; } else /* ints are long ints. */ @@ -455,7 +455,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) case 'q': case 'L': /* doubles are long doubles, and ints are long long ints. */ - flags |= need_longlong ? LONGDBL | LONG; + flags |= need_longlong ? LONGDBL : LONG; break; case 'a': /* The `a' is used as a flag only if followed by `s', `S' or diff --git a/wcsmbs/wcstol.c b/sysdeps/generic/wcstol.c index 2f7d144255..2f7d144255 100644 --- a/wcsmbs/wcstol.c +++ b/sysdeps/generic/wcstol.c diff --git a/wcsmbs/wcstol_l.c b/sysdeps/generic/wcstol_l.c index abe7a98332..abe7a98332 100644 --- a/wcsmbs/wcstol_l.c +++ b/sysdeps/generic/wcstol_l.c diff --git a/wcsmbs/wcstoll.c b/sysdeps/generic/wcstoll.c index b3e9ac0093..b3e9ac0093 100644 --- a/wcsmbs/wcstoll.c +++ b/sysdeps/generic/wcstoll.c diff --git a/wcsmbs/wcstoll_l.c b/sysdeps/generic/wcstoll_l.c index 136d0c7ee9..136d0c7ee9 100644 --- a/wcsmbs/wcstoll_l.c +++ b/sysdeps/generic/wcstoll_l.c diff --git a/wcsmbs/wcstoul.c b/sysdeps/generic/wcstoul.c index 514c827835..514c827835 100644 --- a/wcsmbs/wcstoul.c +++ b/sysdeps/generic/wcstoul.c diff --git a/wcsmbs/wcstoul_l.c b/sysdeps/generic/wcstoul_l.c index 0a346cc014..0a346cc014 100644 --- a/wcsmbs/wcstoul_l.c +++ b/sysdeps/generic/wcstoul_l.c diff --git a/wcsmbs/wcstoull.c b/sysdeps/generic/wcstoull.c index a33d3aed6b..a33d3aed6b 100644 --- a/wcsmbs/wcstoull.c +++ b/sysdeps/generic/wcstoull.c diff --git a/wcsmbs/wcstoull_l.c b/sysdeps/generic/wcstoull_l.c index 5f6238c00f..5f6238c00f 100644 --- a/wcsmbs/wcstoull_l.c +++ b/sysdeps/generic/wcstoull_l.c diff --git a/sysdeps/wordsize-64/wcstol.c b/sysdeps/wordsize-64/wcstol.c new file mode 100644 index 0000000000..f7873b745b --- /dev/null +++ b/sysdeps/wordsize-64/wcstol.c @@ -0,0 +1,10 @@ +/* We have to irritate the compiler a bit. */ +#define __wcstoll_internal __wcstoll_internal_XXX +#define wcstoll wcstoll_XXX + +#include <sysdeps/generic/wcstol.c> + +#undef __wcstoll_internal +#undef wcstoll +strong_alias (__wcstol_internal, __wcstoll_internal) +weak_alias (__wcstoll_internal, wcstoll) diff --git a/sysdeps/wordsize-64/wcstol_l.c b/sysdeps/wordsize-64/wcstol_l.c new file mode 100644 index 0000000000..acfd046db6 --- /dev/null +++ b/sysdeps/wordsize-64/wcstol_l.c @@ -0,0 +1,10 @@ +/* We have to irritate the compiler a bit. */ +#define ____wcstoll_l_internal ____wcstoll_l_internal_XXX +#define __wcstoll_l __wcstoll_l_XXX + +#include <sysdeps/generic/wcstol_l.c> + +#undef ____wcstoll_l_internal +#undef __wcstoll_l +strong_alias (____wcstol_l_internal, ____wcstoll_l_internal) +weak_alias (____wcstoll_l_internal, __wcstoll_l) diff --git a/sysdeps/wordsize-64/wcstoll.c b/sysdeps/wordsize-64/wcstoll.c new file mode 100644 index 0000000000..476ce3e28c --- /dev/null +++ b/sysdeps/wordsize-64/wcstoll.c @@ -0,0 +1 @@ +/* Not needed, it's the same as wcstol. */ diff --git a/sysdeps/wordsize-64/wcstoll_l.c b/sysdeps/wordsize-64/wcstoll_l.c new file mode 100644 index 0000000000..e47f6365f5 --- /dev/null +++ b/sysdeps/wordsize-64/wcstoll_l.c @@ -0,0 +1 @@ +/* Not needed, it's the same as wcstol_l. */ diff --git a/sysdeps/wordsize-64/wcstoul.c b/sysdeps/wordsize-64/wcstoul.c new file mode 100644 index 0000000000..235e1e3d29 --- /dev/null +++ b/sysdeps/wordsize-64/wcstoul.c @@ -0,0 +1,10 @@ +/* We have to irritate the compiler a bit. */ +#define __wcstoull_internal __wcstoull_internal_XXX +#define wcstoull wcstoull_XXX + +#include <sysdeps/generic/wcstoul.c> + +#undef __wcstoull_internal +#undef wcstoull +strong_alias (__wcstoul_internal, __wcstoull_internal) +weak_alias (__wcstoull_internal, wcstoull) diff --git a/sysdeps/wordsize-64/wcstoul_l.c b/sysdeps/wordsize-64/wcstoul_l.c new file mode 100644 index 0000000000..24e54dfdca --- /dev/null +++ b/sysdeps/wordsize-64/wcstoul_l.c @@ -0,0 +1,10 @@ +/* We have to irritate the compiler a bit. */ +#define ____wcstoull_l_internal ____wcstoull_l_internal_XXX +#define __wcstoull_l __wcstoull_l_XXX + +#include <sysdeps/generic/wcstoul_l.c> + +#undef ____wcstoull_l_internal +#undef __wcstoull_l +strong_alias (____wcstoul_l_internal, ____wcstoull_l_internal) +weak_alias (____wcstoull_l_internal, __wcstoull_l) diff --git a/sysdeps/wordsize-64/wcstoull.c b/sysdeps/wordsize-64/wcstoull.c new file mode 100644 index 0000000000..4776c3a07d --- /dev/null +++ b/sysdeps/wordsize-64/wcstoull.c @@ -0,0 +1 @@ +/* Not needed, it's the same as wcstoul. */ diff --git a/sysdeps/wordsize-64/wcstoull_l.c b/sysdeps/wordsize-64/wcstoull_l.c new file mode 100644 index 0000000000..2c9aaa0735 --- /dev/null +++ b/sysdeps/wordsize-64/wcstoull_l.c @@ -0,0 +1 @@ +/* Not needed, it's the same as wcstoul_l. */ |