From 40cbb1a73b1010ac37710742e42d14fd6108dc07 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 25 May 1999 14:54:29 +0000 Subject: Update. * 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. --- ChangeLog | 26 ++++++++++++++++++++++++++ stdio-common/vfscanf.c | 4 ++-- sysdeps/generic/wcstol.c | 23 +++++++++++++++++++++++ sysdeps/generic/wcstol_l.c | 30 ++++++++++++++++++++++++++++++ sysdeps/generic/wcstoll.c | 25 +++++++++++++++++++++++++ sysdeps/generic/wcstoll_l.c | 30 ++++++++++++++++++++++++++++++ sysdeps/generic/wcstoul.c | 23 +++++++++++++++++++++++ sysdeps/generic/wcstoul_l.c | 30 ++++++++++++++++++++++++++++++ sysdeps/generic/wcstoull.c | 25 +++++++++++++++++++++++++ sysdeps/generic/wcstoull_l.c | 31 +++++++++++++++++++++++++++++++ sysdeps/wordsize-64/wcstol.c | 10 ++++++++++ sysdeps/wordsize-64/wcstol_l.c | 10 ++++++++++ sysdeps/wordsize-64/wcstoll.c | 1 + sysdeps/wordsize-64/wcstoll_l.c | 1 + sysdeps/wordsize-64/wcstoul.c | 10 ++++++++++ sysdeps/wordsize-64/wcstoul_l.c | 10 ++++++++++ sysdeps/wordsize-64/wcstoull.c | 1 + sysdeps/wordsize-64/wcstoull_l.c | 1 + wcsmbs/wcstol.c | 23 ----------------------- wcsmbs/wcstol_l.c | 30 ------------------------------ wcsmbs/wcstoll.c | 25 ------------------------- wcsmbs/wcstoll_l.c | 30 ------------------------------ wcsmbs/wcstoul.c | 23 ----------------------- wcsmbs/wcstoul_l.c | 30 ------------------------------ wcsmbs/wcstoull.c | 25 ------------------------- wcsmbs/wcstoull_l.c | 31 ------------------------------- 26 files changed, 289 insertions(+), 219 deletions(-) create mode 100644 sysdeps/generic/wcstol.c create mode 100644 sysdeps/generic/wcstol_l.c create mode 100644 sysdeps/generic/wcstoll.c create mode 100644 sysdeps/generic/wcstoll_l.c create mode 100644 sysdeps/generic/wcstoul.c create mode 100644 sysdeps/generic/wcstoul_l.c create mode 100644 sysdeps/generic/wcstoull.c create mode 100644 sysdeps/generic/wcstoull_l.c create mode 100644 sysdeps/wordsize-64/wcstol.c create mode 100644 sysdeps/wordsize-64/wcstol_l.c create mode 100644 sysdeps/wordsize-64/wcstoll.c create mode 100644 sysdeps/wordsize-64/wcstoll_l.c create mode 100644 sysdeps/wordsize-64/wcstoul.c create mode 100644 sysdeps/wordsize-64/wcstoul_l.c create mode 100644 sysdeps/wordsize-64/wcstoull.c create mode 100644 sysdeps/wordsize-64/wcstoull_l.c delete mode 100644 wcsmbs/wcstol.c delete mode 100644 wcsmbs/wcstol_l.c delete mode 100644 wcsmbs/wcstoll.c delete mode 100644 wcsmbs/wcstoll_l.c delete mode 100644 wcsmbs/wcstoul.c delete mode 100644 wcsmbs/wcstoul_l.c delete mode 100644 wcsmbs/wcstoull.c delete mode 100644 wcsmbs/wcstoull_l.c diff --git a/ChangeLog b/ChangeLog index 95e74b32af..13bb87acfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 * 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/sysdeps/generic/wcstol.c b/sysdeps/generic/wcstol.c new file mode 100644 index 0000000000..2f7d144255 --- /dev/null +++ b/sysdeps/generic/wcstol.c @@ -0,0 +1,23 @@ +/* Function to parse a `long int' from text. + Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + 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. */ + +#define USE_WIDE_CHAR 1 + +#include diff --git a/sysdeps/generic/wcstol_l.c b/sysdeps/generic/wcstol_l.c new file mode 100644 index 0000000000..abe7a98332 --- /dev/null +++ b/sysdeps/generic/wcstol_l.c @@ -0,0 +1,30 @@ +/* Convert string representing a number to integer value, using given locale. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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. */ + +#define __need_wchar_t +#include +#include + +#define USE_IN_EXTENDED_LOCALE_MODEL 1 + +extern long int ____wcstol_l_internal (const wchar_t *, wchar_t **, int, int, + __locale_t); + +#include diff --git a/sysdeps/generic/wcstoll.c b/sysdeps/generic/wcstoll.c new file mode 100644 index 0000000000..b3e9ac0093 --- /dev/null +++ b/sysdeps/generic/wcstoll.c @@ -0,0 +1,25 @@ +/* Function to parse a `long long int' from text. + Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + 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. */ + +#define QUAD 1 + +#include "wcstol.c" + +weak_alias (wcstoll, wcstoq) diff --git a/sysdeps/generic/wcstoll_l.c b/sysdeps/generic/wcstoll_l.c new file mode 100644 index 0000000000..136d0c7ee9 --- /dev/null +++ b/sysdeps/generic/wcstoll_l.c @@ -0,0 +1,30 @@ +/* Convert string representing a number to integer value, using given locale. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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. */ + +#define __need_wchar_t +#include +#include + +#define USE_IN_EXTENDED_LOCALE_MODEL 1 + +extern long long int ____wcstoll_l_internal (const wchar_t *, wchar_t **, + int, int, __locale_t); + +#include diff --git a/sysdeps/generic/wcstoul.c b/sysdeps/generic/wcstoul.c new file mode 100644 index 0000000000..514c827835 --- /dev/null +++ b/sysdeps/generic/wcstoul.c @@ -0,0 +1,23 @@ +/* Function to parse an `unsigned long int' from text. + Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + 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. */ + +#define UNSIGNED 1 + +#include "wcstol.c" diff --git a/sysdeps/generic/wcstoul_l.c b/sysdeps/generic/wcstoul_l.c new file mode 100644 index 0000000000..0a346cc014 --- /dev/null +++ b/sysdeps/generic/wcstoul_l.c @@ -0,0 +1,30 @@ +/* Convert string representing a number to integer value, using given locale. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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. */ + +#define __need_wchar_t +#include +#include + +#define USE_IN_EXTENDED_LOCALE_MODEL 1 + +extern unsigned long int ____wcstoul_l_internal (const wchar_t *, wchar_t **, + int, int, __locale_t); + +#include diff --git a/sysdeps/generic/wcstoull.c b/sysdeps/generic/wcstoull.c new file mode 100644 index 0000000000..a33d3aed6b --- /dev/null +++ b/sysdeps/generic/wcstoull.c @@ -0,0 +1,25 @@ +/* Function to parse an `unsigned long long int' from text. + Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + 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. */ + +#define QUAD 1 + +#include "wcstoul.c" + +weak_alias (wcstoull, wcstouq) diff --git a/sysdeps/generic/wcstoull_l.c b/sysdeps/generic/wcstoull_l.c new file mode 100644 index 0000000000..5f6238c00f --- /dev/null +++ b/sysdeps/generic/wcstoull_l.c @@ -0,0 +1,31 @@ +/* Convert string representing a number to integer value, using given locale. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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. */ + +#define __need_wchar_t +#include +#include + +#define USE_IN_EXTENDED_LOCALE_MODEL 1 + +extern unsigned long long int ____wcstoull_l_internal (const wchar_t *, + wchar_t **, int, int, + __locale_t); + +#include 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 + +#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 + +#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 + +#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 + +#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. */ diff --git a/wcsmbs/wcstol.c b/wcsmbs/wcstol.c deleted file mode 100644 index 2f7d144255..0000000000 --- a/wcsmbs/wcstol.c +++ /dev/null @@ -1,23 +0,0 @@ -/* Function to parse a `long int' from text. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. - - 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. */ - -#define USE_WIDE_CHAR 1 - -#include diff --git a/wcsmbs/wcstol_l.c b/wcsmbs/wcstol_l.c deleted file mode 100644 index abe7a98332..0000000000 --- a/wcsmbs/wcstol_l.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Convert string representing a number to integer value, using given locale. - Copyright (C) 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 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. */ - -#define __need_wchar_t -#include -#include - -#define USE_IN_EXTENDED_LOCALE_MODEL 1 - -extern long int ____wcstol_l_internal (const wchar_t *, wchar_t **, int, int, - __locale_t); - -#include diff --git a/wcsmbs/wcstoll.c b/wcsmbs/wcstoll.c deleted file mode 100644 index b3e9ac0093..0000000000 --- a/wcsmbs/wcstoll.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Function to parse a `long long int' from text. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. - - 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. */ - -#define QUAD 1 - -#include "wcstol.c" - -weak_alias (wcstoll, wcstoq) diff --git a/wcsmbs/wcstoll_l.c b/wcsmbs/wcstoll_l.c deleted file mode 100644 index 136d0c7ee9..0000000000 --- a/wcsmbs/wcstoll_l.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Convert string representing a number to integer value, using given locale. - Copyright (C) 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 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. */ - -#define __need_wchar_t -#include -#include - -#define USE_IN_EXTENDED_LOCALE_MODEL 1 - -extern long long int ____wcstoll_l_internal (const wchar_t *, wchar_t **, - int, int, __locale_t); - -#include diff --git a/wcsmbs/wcstoul.c b/wcsmbs/wcstoul.c deleted file mode 100644 index 514c827835..0000000000 --- a/wcsmbs/wcstoul.c +++ /dev/null @@ -1,23 +0,0 @@ -/* Function to parse an `unsigned long int' from text. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. - - 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. */ - -#define UNSIGNED 1 - -#include "wcstol.c" diff --git a/wcsmbs/wcstoul_l.c b/wcsmbs/wcstoul_l.c deleted file mode 100644 index 0a346cc014..0000000000 --- a/wcsmbs/wcstoul_l.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Convert string representing a number to integer value, using given locale. - Copyright (C) 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 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. */ - -#define __need_wchar_t -#include -#include - -#define USE_IN_EXTENDED_LOCALE_MODEL 1 - -extern unsigned long int ____wcstoul_l_internal (const wchar_t *, wchar_t **, - int, int, __locale_t); - -#include diff --git a/wcsmbs/wcstoull.c b/wcsmbs/wcstoull.c deleted file mode 100644 index a33d3aed6b..0000000000 --- a/wcsmbs/wcstoull.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Function to parse an `unsigned long long int' from text. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. - - 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. */ - -#define QUAD 1 - -#include "wcstoul.c" - -weak_alias (wcstoull, wcstouq) diff --git a/wcsmbs/wcstoull_l.c b/wcsmbs/wcstoull_l.c deleted file mode 100644 index 5f6238c00f..0000000000 --- a/wcsmbs/wcstoull_l.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Convert string representing a number to integer value, using given locale. - Copyright (C) 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 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. */ - -#define __need_wchar_t -#include -#include - -#define USE_IN_EXTENDED_LOCALE_MODEL 1 - -extern unsigned long long int ____wcstoull_l_internal (const wchar_t *, - wchar_t **, int, int, - __locale_t); - -#include -- cgit v1.2.3