diff options
| author | Simon Josefsson <simon@josefsson.org> | 2011-04-24 10:30:21 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2011-04-24 11:00:17 +0200 |
| commit | 09ad4a8dfd18822961c5a8501467eab2a193f670 (patch) | |
| tree | 7625331295142f00828ac32a1fb4b5da0c9a142d /gl/stdint.in.h | |
| parent | cc8b9e8b383fb49e03606255949a00143f0f89a2 (diff) | |
| download | libtasn1-09ad4a8dfd18822961c5a8501467eab2a193f670.tar.gz libtasn1-09ad4a8dfd18822961c5a8501467eab2a193f670.tar.bz2 libtasn1-09ad4a8dfd18822961c5a8501467eab2a193f670.zip | |
Update gnulib files and fix syntax-check warnings.
Diffstat (limited to 'gl/stdint.in.h')
| -rw-r--r-- | gl/stdint.in.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gl/stdint.in.h b/gl/stdint.in.h index 0a9cef0..b32227b 100644 --- a/gl/stdint.in.h +++ b/gl/stdint.in.h @@ -108,6 +108,8 @@ warnings in the signed case. */ \ ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) +#if !GNULIB_defined_stdint_types + /* 7.18.1.1. Exact-width integer types */ /* Here we assume a standard architecture where the hardware integer @@ -296,6 +298,9 @@ typedef unsigned long int gl_uintmax_t; typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) ? 1 : -1]; +#define GNULIB_defined_stdint_types 1 +#endif /* !GNULIB_defined_stdint_types */ + /* 7.18.2. Limits of specified-width integer types */ #if ! defined __cplusplus || defined __STDC_LIMIT_MACROS @@ -492,7 +497,12 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) sequence of nested includes <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes <stdint.h> and assumes its types are already defined. */ -#if ! (defined WCHAR_MIN && defined WCHAR_MAX) +#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX) + /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be + included before <wchar.h>. */ +# include <stddef.h> +# include <stdio.h> +# include <time.h> # define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H # include <wchar.h> # undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H |