diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-26 17:21:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-26 17:21:47 +0100 |
| commit | cd235e389d6ea2c9d9c8b15722659d9c3d5bf0a3 (patch) | |
| tree | ef667d2b39d964ea9c88b27f3018d8053faa2624 | |
| parent | 6ecf41eb2dcc4f15399cc8dc78547a517294781f (diff) | |
No (more/apparent) need for LIBO_WERROR
Change-Id: I8483047631f512513cae017fdbb2dee77ce0f52f
| -rw-r--r-- | i18npool/source/textconversion/textconversion_ko.cxx | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index f20a1e6f62bd..d9fe16ccce20 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -137,7 +137,6 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos const sal_uInt16* (*getHanja2HangulIndex)() = (const sal_uInt16* (*)()) getFunctionBySymbol("getHanja2HangulIndex"); const sal_Unicode* (*getHanja2HangulData)() = (const sal_Unicode* (*)()) getFunctionBySymbol("getHanja2HangulData"); #else -#ifdef LIBO_WERROR #pragma GCC diagnostic push #ifdef __clang__ #pragma GCC diagnostic warning "-Wbool-conversions" @@ -145,7 +144,6 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos #pragma GCC diagnostic warning "-Waddress" #endif #endif -#endif if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount && getHangul2HanjaData) { ch = aText[nStartPos]; const Hangul_Index *Hangul_ko = getHangul2HanjaIndex(); @@ -192,7 +190,7 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos } delete[] newStr; } -#if defined(DISABLE_DYNLOADING) && defined(LIBO_WERROR) +#if defined(DISABLE_DYNLOADING) #pragma GCC diagnostic pop #endif return output; diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index d20b9f78ac20..a695a2f7efa2 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -100,8 +100,8 @@ endif endif ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) -gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR -gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR +gb_CFLAGS_WERROR := -Werror +gb_CXXFLAGS_WERROR := -Werror endif ifeq ($(MERGELIBS),TRUE) diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 2466422851bd..e8488ef74c3a 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -233,8 +233,8 @@ gb_STDLIBS := \ advapi32.lib \ ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) -gb_CFLAGS_WERROR := -WX -DLIBO_WERROR -gb_CXXFLAGS_WERROR := -WX -DLIBO_WERROR +gb_CFLAGS_WERROR := -WX +gb_CXXFLAGS_WERROR := -WX endif ifeq ($(MERGELIBS),TRUE) |