diff options
| -rw-r--r-- | sd/qa/unit/makefile.mk | 7 | ||||
| -rw-r--r-- | sd/source/ui/dlg/gluectrl.cxx | 2 | ||||
| -rw-r--r-- | slideshow/test/makefile.mk | 7 |
3 files changed, 1 insertions, 15 deletions
diff --git a/sd/qa/unit/makefile.mk b/sd/qa/unit/makefile.mk index 0814a354797f..cf0c35f42e8c 100644 --- a/sd/qa/unit/makefile.mk +++ b/sd/qa/unit/makefile.mk @@ -35,13 +35,6 @@ 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) SHL1TARGET = $(TARGET) diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 42bf9db12f49..e5f837431edc 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -30,7 +30,7 @@ #include "precompiled_sd.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <svx/dialogs.hrc> #include <svx/svdglue.hxx> diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk index c7f63bb14e7d..d5a70898eade 100644 --- a/slideshow/test/makefile.mk +++ b/slideshow/test/makefile.mk @@ -39,13 +39,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk -#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) # --- Common ---------------------------------------------------------- |