[Libreoffice-commits] .: Branch 'libreoffice-3-3' - tools/qa

[Caolán McNamara]

 tools/qa/makefile.mk        |    7 +++++++
 tools/qa/test_pathutils.cxx |    2 ++
 2 files changed, 9 insertions(+)

New commits:
commit 946f6fe36abf895947484f5d0cb70181c72b3862
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 2 09:47:10 2010 +0000

    better backport this to stable

diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk
index 67d8f62..7e8720e 100644
--- a/tools/qa/makefile.mk
+++ b/tools/qa/makefile.mk
@@ -32,6 +32,13 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+#building with stlport, but cppunit was not built with stlport
+.IF "$(USE_SYSTEM_STL)"!="YES"
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGSCXX+=-DADAPT_EXT_STL
+.ENDIF
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 DLLPRE = # no leading "lib" on .so files
 
diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx
index 70bd82e..aa9a24e 100644
--- a/tools/qa/test_pathutils.cxx
+++ b/tools/qa/test_pathutils.cxx
@@ -31,9 +31,11 @@
 
 #include <cwchar>
 
+#include "preextstl.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
+#include "postextstl.h"
 
 #include "tools/pathutils.hxx"