mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix jurt/source/pipe/staticsalhack.cxx

Browse Source 
> 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 22de5757a2 "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>
This commit is contained in:
Stephan Bergmann
2022-02-28 14:10:55 +01:00
parent 97ca239014
commit 0694a66e8e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jurt/source/pipe/staticsalhack.cxx
View File

@@ -17,10 +17,18 @@
#include <config_probes.h> #include <config_probes.h>
#include <sal/rtl/strbuf.cxx>
#if USE_SDT_PROBES
#undef RTL_LOG_STRING_BITS
#endif
#include <sal/rtl/string.cxx> #include <sal/rtl/string.cxx>
#if USE_SDT_PROBES #if USE_SDT_PROBES
#undef RTL_LOG_STRING_BITS #undef RTL_LOG_STRING_BITS
#endif #endif
#include <sal/rtl/ustrbuf.cxx>
#if USE_SDT_PROBES
#undef RTL_LOG_STRING_BITS
#endif
#include <sal/rtl/ustring.cxx> #include <sal/rtl/ustring.cxx>
#if USE_SDT_PROBES #if USE_SDT_PROBES
#undef RTL_LOG_STRING_BITS #undef RTL_LOG_STRING_BITS
@@ -56,10 +64,8 @@
#include <sal/rtl/hash.cxx> #include <sal/rtl/hash.cxx>
#include <sal/rtl/locale.cxx> #include <sal/rtl/locale.cxx>
#include <sal/rtl/math.cxx> #include <sal/rtl/math.cxx>
#include <sal/rtl/strbuf.cxx>
#include <sal/rtl/strimp.cxx> #include <sal/rtl/strimp.cxx>
#include <sal/rtl/uri.cxx> #include <sal/rtl/uri.cxx>
#include <sal/rtl/ustrbuf.cxx>
#include <sal/textenc/converter.cxx> #include <sal/textenc/converter.cxx>
#include <sal/textenc/convertsimple.cxx> #include <sal/textenc/convertsimple.cxx>
#include <sal/textenc/handleundefinedunicodetotextchar.cxx> #include <sal/textenc/handleundefinedunicodetotextchar.cxx>