diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-02-28 14:10:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-02-28 18:11:23 +0100 |
| commit | 0694a66e8e5ad3c83f28a093add009ecc37d500b (patch) | |
| tree | 02fe61e6e0df59707f98987b2c68e10eafb5f280 /jurt/source | |
| parent | 97ca239014e50d26bb2553ebeb96e0bc57e27d2d (diff) | |
Fix jurt/source/pipe/staticsalhack.cxx
> jurt/source/pipe/staticsalhack.cxx:62:
> sal/rtl/ustrbuf.cxx:29:9: error: 'RTL_LOG_STRING_BITS' macro redefined [-Werror,-Wmacro-redefined]
> #define RTL_LOG_STRING_BITS 16
> ^
> sal/rtl/strbuf.cxx:27:9: note: previous definition is here
> #define RTL_LOG_STRING_BITS 8
> ^
> In file included from jurt/source/pipe/staticsalhack.cxx:62:
> sal/rtl/ustrbuf.cxx:29:9: error: duplicate defines [loplugin:duplicatedefines]
> #define RTL_LOG_STRING_BITS 16
> ^
> sal/rtl/strbuf.cxx:27:9: note: previous define [loplugin:duplicatedefines]
> #define RTL_LOG_STRING_BITS 8
> ^
after 22de5757a2c7c6cd4544a4699e5d4c69969f5961 "Deduplicate string buffer code"
Change-Id: I5e6883effea0ce53c96cb5da8e02142450216ad4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130711
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jurt/source')
| -rw-r--r-- | jurt/source/pipe/staticsalhack.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/jurt/source/pipe/staticsalhack.cxx b/jurt/source/pipe/staticsalhack.cxx index 78a44bba6bb1..ac83bd84fb59 100644 --- a/jurt/source/pipe/staticsalhack.cxx +++ b/jurt/source/pipe/staticsalhack.cxx @@ -17,10 +17,18 @@ #include <config_probes.h> +#include <sal/rtl/strbuf.cxx> +#if USE_SDT_PROBES +#undef RTL_LOG_STRING_BITS +#endif #include <sal/rtl/string.cxx> #if USE_SDT_PROBES #undef RTL_LOG_STRING_BITS #endif +#include <sal/rtl/ustrbuf.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 @@ -56,10 +64,8 @@ #include <sal/rtl/hash.cxx> #include <sal/rtl/locale.cxx> #include <sal/rtl/math.cxx> -#include <sal/rtl/strbuf.cxx> #include <sal/rtl/strimp.cxx> #include <sal/rtl/uri.cxx> -#include <sal/rtl/ustrbuf.cxx> #include <sal/textenc/converter.cxx> #include <sal/textenc/convertsimple.cxx> #include <sal/textenc/handleundefinedunicodetotextchar.cxx> |