diff options
author | Bruno Haible <bruno@clisp.org> | 2016-12-19 21:12:54 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2016-12-19 21:12:54 +0100 |
commit | 5a400b3f5a1f5483dbfd75d38bdb7080218a063b (patch) | |
tree | 956443d930c30b39a4ae2d4f8c287fbea51239f2 /lib/wctype.in.h | |
parent | 571a9a5a3d1e53e0b93885711fcf6910f347f062 (diff) | |
download | gnulib-5a400b3f5a1f5483dbfd75d38bdb7080218a063b.tar.gz |
stdint: Fix WINT_MAX to match the gnulib provided wint_t on minw.
* m4/wint_t.m4 (gt_TYPE_WINT_T): Define GNULIB_OVERRIDES_WINT_T here.
* m4/stdint.m4 (gl_STDINT_H): Don't define GNULIB_OVERRIDES_WINT_T.
Invoke gt_TYPE_WINT_T instead.
(gl_STDINT_TYPE_PROPERTIES): Test GNULIB_OVERRIDES_WINT_T.
* modules/stdint (Files): Add m4/wint_t.m4.
* modules/wchar (Makefile.am): Substitute GNULIB_OVERRIDES_WINT_T.
* modules/wctype-h (Makefile.am): Likewise.
* lib/wchar.in.h (wint_t): Override if GNULIB_OVERRIDES_WINT_T is set,
not only on MSVC.
* lib/wctype.in.h (wint_t): Likewise.
Diffstat (limited to 'lib/wctype.in.h')
-rw-r--r-- | lib/wctype.in.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wctype.in.h b/lib/wctype.in.h index ddc34d0a1d..615cdc832b 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -105,10 +105,10 @@ _GL_INLINE_HEADER_BEGIN # define WEOF -1 # endif #else -/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>. +/* mingw and MSVC define wint_t as 'unsigned short' in <crtdefs.h>. This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be "unchanged by default argument promotions". Override it. */ -# if defined _MSC_VER +# if @GNULIB_OVERRIDES_WINT_T@ # if !GNULIB_defined_wint_t # include <crtdefs.h> typedef unsigned int rpl_wint_t; |