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 /modules | |
| 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 'modules')
| -rw-r--r-- | modules/stdint | 1 | ||||
| -rw-r--r-- | modules/wchar | 1 | ||||
| -rw-r--r-- | modules/wctype-h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/modules/stdint b/modules/stdint index 75ce257922..d50b453f44 100644 --- a/modules/stdint +++ b/modules/stdint @@ -10,6 +10,7 @@ Macros are used instead of typedefs. Files: lib/stdint.in.h m4/stdint.m4 +m4/wint_t.m4 m4/longlong.m4 Depends-on: diff --git a/modules/wchar b/modules/wchar index abaf6b7be6..f29b200b3a 100644 --- a/modules/wchar +++ b/modules/wchar @@ -31,6 +31,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ diff --git a/modules/wctype-h b/modules/wctype-h index b2cbdcde6b..adfb218f62 100644 --- a/modules/wctype-h +++ b/modules/wctype-h @@ -31,6 +31,7 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ |