include/vcl/opengl/OpenGLHelper.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 88c6e127b3b9d2c80bb3cf04e74c4152ddfe9674
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Sun Mar 3 19:32:16 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Mar 4 07:30:34 2024 +0100
Fix --enable-mergelibs=more --enable-sal-log build
...after 621e16205363c1eea0be57017997396dee63df4b "add
UNLESS_MERGELIBS_MORE and
use to reduce symbol visibility" caused
> vcl/source/opengl/x11/context.cxx:118: error: undefined reference to
'OpenGLHelper::debugMsgStream(std::__cxx11::basic_ostringstream<char,
std::char_traits<char>, std::allocator<char> > const&)'
> vcl/source/opengl/x11/context.cxx:270: error: undefined reference to
'OpenGLHelper::debugMsgStream(std::__cxx11::basic_ostringstream<char,
std::char_traits<char>, std::allocator<char> > const&)'
> vcl/source/opengl/x11/context.cxx:370: error: undefined reference to
'OpenGLHelper::debugMsgStream(std::__cxx11::basic_ostringstream<char,
std::char_traits<char>, std::allocator<char> > const&)'
> vcl/source/opengl/x11/context.cxx:251: error: undefined reference to
'OpenGLHelper::debugMsgStream(std::__cxx11::basic_ostringstream<char,
std::char_traits<char>, std::allocator<char> > const&)'
> collect2: error: ld returned 1 exit status
> make[1]: *** [vcl/Library_vclplug_gen.mk:20:
instdir/program/libvclplug_genlo.so] Error 1
Change-Id: If27b1ffaad7b40dd3baffa8b3a33b1cc3a8e7153
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164314
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index 715636147747..e213bfccf14e 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -100,7 +100,7 @@ public:
__attribute__ ((format (printf, 2, 3)))
#endif
static void debugMsgPrint(const int nType, const char *pFormat, ...);
- static void debugMsgStream(std::ostringstream const &pStream);
+ IF_MERGELIBS_MORE(VCL_DLLPUBLIC) static void
debugMsgStream(std::ostringstream const &pStream);
static void debugMsgStreamWarn(std::ostringstream const &pStream);
/**
