diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-11 13:18:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-11 14:43:36 +0000 |
| commit | 65b7f0525708b43613c0a08f71ec362894cf8953 (patch) | |
| tree | 7723ac91a41f94cda1548b1476c97e658eb73b9f /icu | |
| parent | db993edbdc3743860c42fa5aef11f1fd207d7cb1 (diff) | |
WaE: silence new icu warnings
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-warnings.patch | 21 | ||||
| -rw-r--r-- | icu/makefile.mk | 3 |
2 files changed, 23 insertions, 1 deletions
diff --git a/icu/icu4c-warnings.patch b/icu/icu4c-warnings.patch new file mode 100644 index 000000000000..e484b59a6c69 --- /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 e8dee27956f5..5d7a92b4545b 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" |