From ae177b9c8a14da52538db5749eee90f08f5aedea Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 19 Dec 1999 08:35:44 +0000 Subject: [PATCH] Update. * locale/langinfo.h: Always define CODESET. (CODESET): Define also as macro. --- ChangeLog | 3 +++ locale/langinfo.h | 3 +-- misc/sys/cdefs.h | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b636cdd..d3d08a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1999-12-19 Ulrich Drepper + * locale/langinfo.h: Always define CODESET. + (CODESET): Define also as macro. + * stdio-common/printf_fp.c (__printf_fp): Allocate buffer to generate mantissa output in using malloc if it is larger than 20000 characters. diff --git a/locale/langinfo.h b/locale/langinfo.h index 1a8b743..1248a46 100644 --- a/locale/langinfo.h +++ b/locale/langinfo.h @@ -268,9 +268,8 @@ enum _NL_CTYPE_WIDTH, _NL_CTYPE_MB_CUR_MAX, _NL_CTYPE_CODESET_NAME, -#ifdef __USE_XOPEN CODESET = _NL_CTYPE_CODESET_NAME, -#endif +#define CODESET CODESET _NL_CTYPE_TOUPPER32, _NL_CTYPE_TOLOWER32, _NL_CTYPE_INDIGITS_MB_LEN, diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 7db0575..0a5f65e 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -138,15 +138,15 @@ # define __attribute__(xyz) /* Ignore */ +#endif + /* At some point during the gcc 2.96 development the `malloc' attribute for functions was introduced. We don't want to use it unconditionally (although this would be possible) since it generates warnings. */ -# if __GNUC_PREREQ (2,96) -# define __attribute_malloc__ __attribute__ ((__malloc__)) -# else -# define __attribute_malloc__ /* Ignore */ -# endif - +#if __GNUC_PREREQ (2,96) +# define __attribute_malloc__ __attribute__ ((__malloc__)) +#else +# define __attribute_malloc__ /* Ignore */ #endif /* It is possible to compile containing GCC extensions even if GCC is -- 2.7.4