diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-02-08 16:10:19 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-02-08 20:57:10 +0100 |
| commit | 57cc7797dd95ff34e84b8f91d5102116abe9d0b3 (patch) | |
| tree | dfffb0b55011731a9721535a7e620c8c7e4367b2 /jurt | |
| parent | 1bda6965c905924e8f315063973772585ca87402 (diff) | |
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@redhat.com>
Diffstat (limited to 'jurt')
| -rw-r--r-- | jurt/source/pipe/staticsalhack.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
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> |