diff options
author | Brad King <brad.king@kitware.com> | 2016-03-29 18:29:42 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-03-29 18:29:42 (GMT) |
commit | dc333a7115a43e4e97a2ff3ba269a39526598f88 (patch) | |
tree | 211bc3668cc319eed3ef361f370255d985796908 /Source/kwsys/testEncoding.cxx | |
parent | 90f24f016e93d18f6a244b39fd21c68355bdbe48 (diff) | |
parent | 735c41ddb021a5ca0e8957591447acdb28a0f41b (diff) | |
download | CMake-dc333a7115a43e4e97a2ff3ba269a39526598f88.zip CMake-dc333a7115a43e4e97a2ff3ba269a39526598f88.tar.gz CMake-dc333a7115a43e4e97a2ff3ba269a39526598f88.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-03-29 (b51abb30)
Diffstat (limited to 'Source/kwsys/testEncoding.cxx')
-rw-r--r-- | Source/kwsys/testEncoding.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/kwsys/testEncoding.cxx b/Source/kwsys/testEncoding.cxx index 842b17d..80ec040 100644 --- a/Source/kwsys/testEncoding.cxx +++ b/Source/kwsys/testEncoding.cxx @@ -120,7 +120,7 @@ static int testRobustEncoding() ret++; } -#ifdef WIN32 +#ifdef _WIN32 // 16 bit wchar_t - we make an invalid surrogate pair wchar_t cwstr[] = {0xD801, 0xDA00, 0}; // this conversion could fail |