diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-06 14:35:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-06 14:35:18 +0100 |
| commit | 8672eca430213c28936a526df6266226ecb7ab2d (patch) | |
| tree | 158d61c29c06ba4779fa8e274e841fcc31545df1 | |
| parent | 1b9d9680d9c444a126413ebb996b3bf6b2085de5 (diff) | |
-Werror,-Wmacro-redefined (under Clang -fsanitize=*)
Change-Id: Ifd23373b1ac4919793d1b4251ed90cf2dd6f2bda
| -rw-r--r-- | jurt/source/pipe/staticsalhack.cxx | 7 | ||||
| -rw-r--r-- | sal/rtl/string.cxx | 9 | ||||
| -rw-r--r-- | sal/rtl/ustring.cxx | 9 |
3 files changed, 18 insertions, 7 deletions
diff --git a/jurt/source/pipe/staticsalhack.cxx b/jurt/source/pipe/staticsalhack.cxx index b2c10d4dc6f9..23afde168bda 100644 --- a/jurt/source/pipe/staticsalhack.cxx +++ b/jurt/source/pipe/staticsalhack.cxx @@ -14,13 +14,6 @@ #undef SAL_LOG_WARN #include <sal/rtl/string.cxx> -#undef IMPL_RTL_EMPTYSTRING -#undef IMPL_RTL_STRCODE -#undef IMPL_RTL_STRINGDATA -#undef IMPL_RTL_STRINGNAME -#undef IMPL_RTL_STRNAME -#undef IMPL_RTL_USTRCODE -#undef RTL_LOG_STRING_BITS #include <sal/rtl/ustring.cxx> #include <sal/osl/unx/conditn.cxx> diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx index 07842ecc594c..a71ba162d64e 100644 --- a/sal/rtl/string.cxx +++ b/sal/rtl/string.cxx @@ -76,6 +76,15 @@ static rtl_String const aImplEmpty_rtl_String = #include "strtmpl.cxx" +#undef IMPL_RTL_EMPTYSTRING +#undef IMPL_RTL_IS_USTRING +#undef IMPL_RTL_STRCODE +#undef IMPL_RTL_STRINGDATA +#undef IMPL_RTL_STRINGNAME +#undef IMPL_RTL_STRNAME +#undef IMPL_RTL_USTRCODE +#undef RTL_LOG_STRING_BITS + sal_Int32 SAL_CALL rtl_str_valueOfFloat(sal_Char * pStr, float f) SAL_THROW_EXTERN_C() { diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx index a9406d859b63..082842523e81 100644 --- a/sal/rtl/ustring.cxx +++ b/sal/rtl/ustring.cxx @@ -84,6 +84,15 @@ static void internRelease (rtl_uString *pThis); #include "strtmpl.cxx" +#undef IMPL_RTL_EMPTYSTRING +#undef IMPL_RTL_IS_USTRING +#undef IMPL_RTL_STRCODE +#undef IMPL_RTL_STRINGDATA +#undef IMPL_RTL_STRINGNAME +#undef IMPL_RTL_STRNAME +#undef IMPL_RTL_USTRCODE +#undef RTL_LOG_STRING_BITS + sal_Int32 rtl_ustr_indexOfAscii_WithLength( sal_Unicode const * str, sal_Int32 len, char const * subStr, sal_Int32 subLen) SAL_THROW_EXTERN_C() |