Mercurial > hg > octave-lojdl > gnulib-hg
changeset 8551:a2ed636e1b10
Support 'j' size specifier on all platforms.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 26 Mar 2007 00:14:00 +0000 |
| parents | 0787c53b84f0 |
| children | d527c6045eaf |
| files | ChangeLog lib/printf-parse.c modules/vasnprintf |
| diffstat | 3 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-03-25 Bruno Haible <bruno@clisp.org> + + * lib/printf-parse.c [!IN_LIBINTL]: Include <stdint.h>, for intmax_t. + (PRINTF_PARSE): Make the support for size specifier 'j' unconditional. + * modules/vasnprintf (Depends-on): Add stdint. + 2007-03-25 Bruno Haible <bruno@clisp.org> * modules/fpieee: New file.
--- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -28,12 +28,16 @@ #include <stddef.h> /* Get intmax_t. */ -#if HAVE_STDINT_H_WITH_UINTMAX +#ifdef IN_LIBINTL +# if HAVE_STDINT_H_WITH_UINTMAX +# include <stdint.h> +# endif +# if HAVE_INTTYPES_H_WITH_UINTMAX +# include <inttypes.h> +# endif +#else # include <stdint.h> #endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -# include <inttypes.h> -#endif /* malloc(), realloc(), free(). */ #include <stdlib.h> @@ -326,7 +330,6 @@ flags += 8; cp++; } -#if HAVE_INTMAX_T else if (*cp == 'j') { if (sizeof (intmax_t) > sizeof (long)) @@ -341,7 +344,6 @@ } cp++; } -#endif else if (*cp == 'z' || *cp == 'Z') { /* 'z' is standardized in ISO C 99, but glibc uses 'Z'