[Libreoffice-commits] .: icu/icu4c-warnings.patch icu/makefile.mk

[Caolán McNamara]

 icu/icu4c-warnings.patch |   21 +++++++++++++++++++++
 icu/makefile.mk          |    3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit f204d7b3ea945b5b26db5ec1e8fbd4a02e71ced9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 11 13:18:02 2011 +0000

    WaE: silence new icu warnings

diff --git a/icu/icu4c-warnings.patch b/icu/icu4c-warnings.patch
new file mode 100644
index 0000000..e484b59
--- /dev/null
+++ b/icu/icu4c-warnings.patch
@@ -0,0 +1,21 @@
+--- misc/icu/source/common/unicode/stringpiece.h
++++ misc/build/icu/source/common/unicode/stringpiece.h
+@@ -140,7 +140,7 @@
+    * @param len the length of the new data
+    * @internal
+    */
+-  void set(const char* data, int32_t len) { ptr_ = data; length_ = len; }
++  void set(const char* data_, int32_t len) { ptr_ = data_; length_ = len; }
+ 
+   /**
+    * Reset the stringpiece to refer to new data.
+--- misc/icu/source/common/unicode/
++++ 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); \
+     } \
+ }
+ 
diff --git a/icu/makefile.mk b/icu/makefile.mk
index e8dee27..5d7a92b 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -47,7 +47,8 @@ TARFILE_ROOTDIR=icu
 PATCH_FILES=\
     icu4c-build.patch \
     icu4c.8320.freeserif.crash.patch \
-    icu4c-aix.patch
+    icu4c-aix.patch \
+    icu4c-warnings.patch
 
 .IF "$(GUI)"=="UNX"