diff options
author | Brad King <brad.king@kitware.com> | 2017-06-21 12:35:14 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-21 12:35:18 (GMT) |
commit | ad7cf4b798c71198e8b106b696e25d4d2edceda2 (patch) | |
tree | 3468c6b52380aa4cd989256978f50b4d63881b53 /Utilities/cmexpat/lib/expat_external.h | |
parent | 782c1e2f3741977104ef7bd2861162d861bf45d3 (diff) | |
parent | d5afb178f1829fc5fd9332f70986b95ab62aedcc (diff) | |
download | CMake-ad7cf4b798c71198e8b106b696e25d4d2edceda2.zip CMake-ad7cf4b798c71198e8b106b696e25d4d2edceda2.tar.gz CMake-ad7cf4b798c71198e8b106b696e25d4d2edceda2.tar.bz2 |
Merge topic 'update-expat'
d5afb178 expat: Fix compilation on systems without stdint.h
0a40c668 Merge branch 'upstream-expat' into update-expat
4b8a8c22 expat 2017-06-17 (c4446687)
d9d191a1 expat: Update script to get Expat 2.2.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !987
Diffstat (limited to 'Utilities/cmexpat/lib/expat_external.h')
-rw-r--r-- | Utilities/cmexpat/lib/expat_external.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Utilities/cmexpat/lib/expat_external.h b/Utilities/cmexpat/lib/expat_external.h index 07a3c5c..d60eecc 100644 --- a/Utilities/cmexpat/lib/expat_external.h +++ b/Utilities/cmexpat/lib/expat_external.h @@ -95,7 +95,10 @@ extern "C" { #endif #ifdef XML_UNICODE_WCHAR_T -#define XML_UNICODE +# define XML_UNICODE +# if defined(__SIZEOF_WCHAR_T__) && (__SIZEOF_WCHAR_T__ != 2) +# error "sizeof(wchar_t) != 2; Need -fshort-wchar for both Expat and libc" +# endif #endif #ifdef XML_UNICODE /* Information is UTF-16 encoded. */ |