[Libreoffice-commits] core.git: jurt/source

[Stephan Bergmann (via logerrit)]

 jurt/source/pipe/staticsalhack.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 57cc7797dd95ff34e84b8f91d5102116abe9d0b3
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Feb 8 16:10:19 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Feb 8 20:57:10 2021 +0100

    Avoid macro redefinition warnings in sanitizer builds
    
    ...when configure.ac happens to detect USE_SDT_PROBES, after
    c5c0f8df855dfd4478c57170e251e4a9bcff1c10 "Replace strtmpl.cxx with actual C++
    templates in strtmpl.hxx":
    
    > In file included from jurt/source/pipe/staticsalhack.cxx:20:
    > sal/rtl/ustring.cxx:48:9: error: 'RTL_LOG_STRING_BITS' macro redefined [-Werror,-Wmacro-redefined]
    > #define RTL_LOG_STRING_BITS         16
    >         ^
    > sal/rtl/string.cxx:39:9: note: previous definition is here
    > #define RTL_LOG_STRING_BITS         8
    >         ^
    > In file included from jurt/source/pipe/staticsalhack.cxx:20:
    > sal/rtl/ustring.cxx:48:9: error: duplicate defines [loplugin:duplicatedefines]
    > #define RTL_LOG_STRING_BITS         16
    >         ^
    > sal/rtl/string.cxx:39:9: note: previous define [loplugin:duplicatedefines]
    > #define RTL_LOG_STRING_BITS         8
    >         ^
    > In file included from jurt/source/pipe/staticsalhack.cxx:55:
    > sal/rtl/ustrbuf.cxx:29:9: error: duplicate defines [loplugin:duplicatedefines]
    > #define RTL_LOG_STRING_BITS         16
    >         ^
    > sal/rtl/string.cxx:39:9: note: previous define [loplugin:duplicatedefines]
    > #define RTL_LOG_STRING_BITS         8
    >         ^
    
    Change-Id: I23a1e058cf0d9ab7821dd9b1a2cba22fc69263c6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110584
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/jurt/source/pipe/staticsalhack.cxx b/jurt/source/pipe/staticsalhack.cxx
index b901a494812e..4bba0c53ef33 100644
--- a/jurt/source/pipe/staticsalhack.cxx
+++ b/jurt/source/pipe/staticsalhack.cxx
@@ -16,8 +16,16 @@
 
 #include <cstdlib>
 
+#include <config_probes.h>
+
 #include <sal/rtl/string.cxx>
+#if USE_SDT_PROBES
+#undef RTL_LOG_STRING_BITS
+#endif
 #include <sal/rtl/ustring.cxx>
+#if USE_SDT_PROBES
+#undef RTL_LOG_STRING_BITS
+#endif
 
 #include <sal/osl/all/mutexshared.cxx>
 #include <sal/osl/unx/conditn.cxx>