summaryrefslogtreecommitdiff
path: root/external/icu
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2016-03-13 09:18:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-05-03 19:26:06 +0000
commite16fa715c43dcdf836ce8c400b6d54eae87b627d (patch)
tree356eb41a6333db58a318a2b5da31a9c0893e90a8 /external/icu
parenta2aea8bac55cef23297573733ba28f563f5aa791 (diff)
Handle wchar_t as native C++11 type on windows
The option /Zc:wchar_t- prevented to use wchar_t as a built-in type according to the C++ standard. In Visual C++ 6.0 and earlier, wchar_t was not implemented as a built-in type, but was declared in wchar.h as a typedef for unsigned short. Now, years later after the end of life this outdated toolchain, there is no reason not to use native type. The only issue could be the ABI compatibility. But on a quick look at least, it looks like none of the mangled C++ symbols in the stable URE interface actually depend on wchar_t. We forgot to get rid of /Zc:wchar_t- in 5.1. Do that for LibreOffice 5.2, though. Change-Id: I8d6b380660859efa44c83c830734978d31d756a0 Reviewed-on: https://gerrit.libreoffice.org/22589 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/icu')
-rw-r--r--external/icu/UnpackedTarball_icu.mk1
-rw-r--r--external/icu/icu4c-wchar_t.patch16
2 files changed, 0 insertions, 17 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index 4a6a11477af3..0e4a6455a0a3 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-build.patch \
external/icu/icu4c-aix.patch \
- external/icu/icu4c-wchar_t.patch \
external/icu/icu4c-warnings.patch \
external/icu/icu4c-macosx.patch \
external/icu/icu4c-solarisgcc.patch \
diff --git a/external/icu/icu4c-wchar_t.patch b/external/icu/icu4c-wchar_t.patch
deleted file mode 100644
index 4a8067c879ad..000000000000
--- a/external/icu/icu4c-wchar_t.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- misc/icu/source/config/mh-cygwin-msvc
-+++ misc/build/icu/source/config/mh-cygwin-msvc
-@@ -43,10 +43,9 @@
-
- # /GF pools strings and places them into read-only memory
- # /EHsc enables exception handling
--# /Zc:wchar_t makes wchar_t a native type. Required for C++ ABI compatibility.
- # -D_CRT_SECURE_NO_DEPRECATE is needed to quiet warnings about using standard C functions.
--CFLAGS+=-GF -nologo
--CXXFLAGS+=-GF -nologo -EHsc -Zc:wchar_t
-+CFLAGS+=-GF -nologo -Zc:wchar_t-
-+CXXFLAGS+=-GF -nologo -EHsc -Zc:wchar_t-
- CPPFLAGS+=-D_CRT_SECURE_NO_DEPRECATE
- DEFS+=-DWIN32 -DCYGWINMSVC
- LDFLAGS+=-nologo
-