Mercurial > hg > octave-lyh > gnulib-hg
changeset 4132:98b37cab8b76
More consistent inttypes.h / stdint.h handling.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 06 Jan 2003 12:38:36 +0000 |
| parents | c3ac5b93dfae |
| children | 6e1060363c92 |
| files | lib/human.h lib/strtoimax.c lib/tempname.c lib/xstrtoimax.c lib/xstrtol.h lib/xstrtoumax.c |
| diffstat | 6 files changed, 29 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/human.h +++ b/lib/human.h @@ -7,6 +7,10 @@ # if HAVE_INTTYPES_H # include <inttypes.h> +# else +# if HAVE_STDINT_H +# include <stdint.h> +# endif # endif /* A conservative bound on the maximum length of a human-readable string.
--- a/lib/strtoimax.c +++ b/lib/strtoimax.c @@ -1,5 +1,5 @@ /* Convert string representation of a number into an intmax_t value. - Copyright 1999, 2001 Free Software Foundation, Inc. + Copyright 1999, 2001, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,10 @@ #if HAVE_INTTYPES_H # include <inttypes.h> +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #if HAVE_STDLIB_H
--- a/lib/tempname.c +++ b/lib/tempname.c @@ -61,6 +61,9 @@ #if HAVE_STDINT_H || _LIBC # include <stdint.h> #endif +#if HAVE_INTTYPES_H +# include <inttypes.h> +#endif #if HAVE_UNISTD_H || _LIBC # include <unistd.h>
--- a/lib/xstrtoimax.c +++ b/lib/xstrtoimax.c @@ -1,5 +1,5 @@ /* xstrtoimax.c -- A more useful interface to strtoimax. - Copyright 2001 Free Software Foundation, Inc. + Copyright 2001-2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,10 @@ #if HAVE_INTTYPES_H # include <inttypes.h> +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #define __strtol strtoimax
--- a/lib/xstrtol.h +++ b/lib/xstrtol.h @@ -1,5 +1,5 @@ /* A more useful interface to strtol. - Copyright 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc. + Copyright 1995, 1996, 1998, 1999, 2001, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,8 +18,13 @@ #ifndef XSTRTOL_H_ # define XSTRTOL_H_ 1 +/* Get uintmax_t. */ # if HAVE_INTTYPES_H -# include <inttypes.h> /* for uintmax_t */ +# include <inttypes.h> +# else +# if HAVE_STDINT_H +# include <stdint.h> +# endif # endif # ifndef PARAMS
--- a/lib/xstrtoumax.c +++ b/lib/xstrtoumax.c @@ -1,5 +1,5 @@ /* xstrtoumax.c -- A more useful interface to strtoumax. - Copyright 1999 Free Software Foundation, Inc. + Copyright 1999, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,10 @@ #if HAVE_INTTYPES_H # include <inttypes.h> +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif #endif #define __strtol strtoumax