diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-18 16:57:51 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-18 17:15:56 +0100 |
commit | 7544a11670208ef38af7bf6b0104dedd4d19d545 (patch) | |
tree | 4e69589b5f81704fdf319f34e8a5d655c73306b1 /icu | |
parent | change #ifdef -> #if for KDE4 feature macros (diff) | |
download | core-7544a11670208ef38af7bf6b0104dedd4d19d545.tar.gz core-7544a11670208ef38af7bf6b0104dedd4d19d545.zip |
Wundef for icu
Change-Id: I064b82e691fb5d58da6252f394f13894f252776d
Diffstat (limited to 'icu')
-rw-r--r-- | icu/icu4c-warnings.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/icu/icu4c-warnings.patch b/icu/icu4c-warnings.patch index 72566bc5e8ab..1407f3b5a702 100644 --- a/icu/icu4c-warnings.patch +++ b/icu/icu4c-warnings.patch @@ -8,3 +8,14 @@ } \ } +--- misc/icu/source/common/unicode/utypes.h ++++ misc/build/icu/source/common/unicode/utypes.h +@@ -399,7 +399,7 @@ typedef double UDate; + * some Linux/Unix compilers have problems with defining global new/delete. + * On Windows, it is _MSC_VER>=1200 for MSVC 6.0 and higher. + */ +-#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION)) ++#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && defined (_MSC_VER) && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION)) + + #ifndef U_HIDE_INTERNAL_API + /** |