diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 20:02:31 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-18 07:00:22 +0000 |
| commit | 13818a69d77a5806e2bafa92283a56a9f7ac690d (patch) | |
| tree | 173acbf5d37302ac3848d8de99fcebae64d7606f /icu/icu4c-warnings.patch | |
| parent | 0ba2b78a07e1111208eef45813e14c33c95cef6d (diff) | |
fdo#70393: move icu to a subdir of external
Change-Id: I9d8191848b093240f79207446afb13ca6fd708e4
Reviewed-on: https://gerrit.libreoffice.org/6309
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'icu/icu4c-warnings.patch')
| -rw-r--r-- | icu/icu4c-warnings.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/icu/icu4c-warnings.patch b/icu/icu4c-warnings.patch deleted file mode 100644 index 1407f3b5a702..000000000000 --- a/icu/icu4c-warnings.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- misc/icu/source/common/unicode/utf16.h -+++ misc/build/icu/source/common/unicode/utf16.h -@@ -316,6 +316,7 @@ - (s)[(i)++]=(uint16_t)(((c)&0x3ff)|0xdc00); \ - } else /* c>0x10ffff or not enough space */ { \ - (isError)=TRUE; \ -+ (void)(isError); \ - } \ - } - ---- 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 - /** |