diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-08-30 19:25:43 +0200 |
|---|---|---|
| committer | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-08-30 19:25:43 +0200 |
| commit | bd86cc7c2336e5cba400bda12cee3b6ab6f354ad (patch) | |
| tree | 2bf08e5de65df883413ba018e0f272c03086539b /sax | |
| parent | d6f27116f1cf8356382b3211fe8dbca4f52cd1be (diff) | |
| parent | fa4b286294a272b085c2f74e12581edc2343fc18 (diff) | |
dr77: rebase to DEV300m87
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/qa/cppunit/makefile.mk | 7 | ||||
| -rw-r--r-- | sax/qa/cppunit/test_converter.cxx | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sax/qa/cppunit/makefile.mk b/sax/qa/cppunit/makefile.mk index e06eca25a737..b28f0cbac2ab 100644 --- a/sax/qa/cppunit/makefile.mk +++ b/sax/qa/cppunit/makefile.mk @@ -35,6 +35,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/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index 1ea781afff95..b1881f248c0c 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -25,10 +25,12 @@ * ************************************************************************/ +#include "preextstl.h" #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#include "postextstl.h" #include <rtl/ustrbuf.hxx> |