diff options
author | Roland McGrath <roland@gnu.org> | 1996-05-29 04:48:04 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-05-29 04:48:04 +0000 |
commit | 0200214b288810fc261b0b65c32f7068fcfa9b40 (patch) | |
tree | a488a0a435ccf62b0870121b839b08de0d37a9b5 /stdlib/strtol.c | |
parent | 215dbbb1508bd6b86211112dd5ddaf9bd2290690 (diff) | |
download | glibc-0200214b288810fc261b0b65c32f7068fcfa9b40.tar.gz glibc-0200214b288810fc261b0b65c32f7068fcfa9b40.tar.xz glibc-0200214b288810fc261b0b65c32f7068fcfa9b40.zip |
Tue May 28 04:38:10 1996 Ulrich Drepper <drepper@cygnus.com>
* limits.h: Change MB_LEN_MAX to 6. A 31-bit ISO 10646 character in UTF-8 encoding has that many bytes. * locale/langinfo.h: New element _NL_CTYPE_MB_CUR_MAX. * locale/categories.def: Add description of field _NL_CTYPE_MB_CUR_MAX. * locale/Makefile (routines): Add mb_cur_max. * locale/mb_cur_max.c: New file. This function gets called when the macro MB_CUR_MAX is used. * locale/C-ctype.c: Initialize new mb_cur_max field. * locale/localeinfo.h: Change magic value because of incompatible change. * locale/programs/ld-ctype.c: Determine value of mb_cur_max according to current character set and write it out with the rest. * stdlib/stdlib.h (MB_CUR_MAX): Not constant anymore. Get value according to currently used locale for catefory LC_CTYPE by calling the function __ctype_get_mb_cur_max. Tue May 28 03:27:46 1996 Ulrich Drepper <drepper@cygnus.com> * FAQ: Fix some typos. Tell that for Linux the kernel header files are necessary. * PROJECTS: New file. List of open jobs for glibc. * Makefile (distribute): Add PROJECTS. * crypt/GNUmakefile (headers): New variable. Mention crypt.h. * crypt/crypt.h: Header for crypt functions. * elf/elf.h: Add some new constants from recent Cygnus ELF header files. * login/getutid_r.c: Test for correct type. Don't depend on ut_type and ut_id unless _HAVE_UT_TYPE and _HAVE_UT_ID resp. are defined. Make really compliant with specification. * login/getutline_r.c, login/pututline_r.c: Don't depend on ut_type and ut_id unless _HAVE_UT_TYPE and _HAVE_UT_ID resp. are defined. Make really compliant with specification. * login/setutent_r.c: Don't depend on ut_type and ut_id unless _HAVE_UT_TYPE and _HAVE_UT_ID resp. are defined. * login/login.c, login/logout.c, login/logwtmp.c: Complete rewrite. Now based on getut*/setut* functions. * stdlib/strtol.c: Undo changes of Wed May 22 01:48:54 1996. This prevented using this file in other GNU packages. * sysdeps/gnu/utmpbits.h: Define _HAVE_UT_TYPE, _HAVE_UT_ID, and _HAVE_UT_TV because struct utmp has these members. * sysdeps/libm-i387/e_exp.S: Correct exp(+-Inf) case. * utmp.h: New file. Wrapper around login/utmp.h. * elf/dl-error.c (struct catch): New type. (catch): New static variable, struct catch *. (catch_env, signalled_errstring, signalled_objname): Variables removed. (_dl_signal_error): If CATCH is non-null, set its errstring and objname members and jump to CATCH->env. If it is null, call _dl_sysdep_fatal with a standard message. * elf/rtld.c (dl_main): Explode `doit' function into dl_main's body. No longer use _dl_catch_error.
Diffstat (limited to 'stdlib/strtol.c')
-rw-r--r-- | stdlib/strtol.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/stdlib/strtol.c b/stdlib/strtol.c index 3b073ce333..dd92fb250c 100644 --- a/stdlib/strtol.c +++ b/stdlib/strtol.c @@ -136,10 +136,8 @@ extern int errno; # define INTERNAL(x) INTERNAL1(x) # define INTERNAL1(x) __##x##_internal # define WEAKNAME(x) WEAKNAME1(x) -# define WEAKNAME1(x) __##x #else # define INTERNAL(x) __/**/x/**/_internal -# define WEAKNAME(x) __/**/x #endif #ifdef USE_NUMBER_GROUPING @@ -322,7 +320,7 @@ INTERNAL (strtol) (nptr, endptr, base, group) noconv: /* We must handle a special case here: the base is 0 or 16 and the - first two characters and '0' and 'x', but the rest are no + first two characters are '0' and 'x', but the rest are no hexadecimal digits. This is no error case. We return 0 and ENDPTR points to the `x`. */ if (endptr != NULL) @@ -337,24 +335,18 @@ noconv: } /* External user entry point. */ - -/* Prototype. */ -INT WEAKNAME (strtol) __P ((const STRING_TYPE *nptr, STRING_TYPE **endptr, - int base)); - - INT -WEAKNAME (strtol) (nptr, endptr, base) +strtol (nptr, endptr, base) const STRING_TYPE *nptr; STRING_TYPE **endptr; int base; { return INTERNAL (strtol) (nptr, endptr, base, 0); } - -#ifdef weak_alias -/* We need this indirection when `strtol' is defined as a macro - for one of the other names. */ -#define weak1(x, y) weak_alias (x, y) -weak1 (WEAKNAME (strtol), strtol) +#ifdef weak_symbol +/* We need to weaken this symbol because some the the defined + functions do not come from ANSI. The indirection is necessary + because `strtol' might be a macro. */ +#define weak_this(x) weak_symbol (x) +weak_this (strtol) #endif |