-Werror,-Wmacro-redefined (under Clang -fsanitize=*)

Change-Id: Ifd23373b1ac4919793d1b4251ed90cf2dd6f2bda

-Werror,-Wmacro-redefined (under Clang -fsanitize=*)
Change-Id: Ifd23373b1ac4919793d1b4251ed90cf2dd6f2bda
8672eca4 · Stephan Bergmann · 1b9d9680 · 8672eca4 · 8672eca4 · 8672eca4
Kaydet (Commit) 8672eca4 authored Ock 06, 2015 tarafından Stephan Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 7 deletions

staticsalhack.cxx jurt/source/pipe/staticsalhack.cxx +0 -7

string.cxx sal/rtl/string.cxx +9 -0

ustring.cxx sal/rtl/ustring.cxx +9 -0

No files found.
--- 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>

--- 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()
 {

--- 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()