summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basebmp/test/makefile.mk7
-rw-r--r--basegfx/source/workbench/Makefile2
-rw-r--r--basegfx/test/makefile.mk7
-rw-r--r--comphelper/qa/makefile.mk7
-rw-r--r--i18npool/qa/cppunit/makefile.mk7
-rw-r--r--l10ntools/source/makefile.mk1
-rw-r--r--o3tl/qa/makefile.mk7
-rw-r--r--sax/qa/cppunit/makefile.mk7
-rw-r--r--svl/inc/svl/itemset.hxx4
-rw-r--r--svl/qa/makefile.mk8
-rw-r--r--svl/source/items/itemset.cxx2
-rw-r--r--tools/qa/makefile.mk7
-rw-r--r--vcl/source/glyphs/makefile.mk2
-rw-r--r--vcl/util/makefile2.pmk7
14 files changed, 1 insertions, 74 deletions
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index 4fdc39bb6fd4..cdb4ccef5d52 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -60,13 +60,6 @@ CDEFS+=-xalias_level=compatible
.ENDIF
.ENDIF
-#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 ----------------------------------------------------------
diff --git a/basegfx/source/workbench/Makefile b/basegfx/source/workbench/Makefile
index fe23a4d06708..6586d5f37724 100644
--- a/basegfx/source/workbench/Makefile
+++ b/basegfx/source/workbench/Makefile
@@ -3,7 +3,7 @@
#test : bezierclip.cxx convexhull.cxx
# g++ -Wall -g \
# -I. -I. -I../inc -I./inc -I./unx/inc -I./unxlngi4/inc -I. -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/develop4/update/SRX644/unxlngi4/inc.m4/external -I/develop4/update/SRX644/unxlngi4/inc.m4 -I/develop4/update/SRX644/src.m4/solenv/unxlngi4/inc -I/net/grande/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/include -I/develop4/update/SRX644/src.m4/solenv/inc -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include/X11 -I/develop4/update/SRX644/src.m4/res -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include/linux -I. -I./res -I. \
-# -include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -D_STLP_DEBUG \
+# -include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -D_DEBUG_RUNTIME \
# bezierclip.cxx convexhull.cxx -o bezierclip
prog : bezierclip.cxx convexhull.cxx
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 09d8b805f9f5..2c0f30c291a9 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -36,13 +36,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)
# --- Common ----------------------------------------------------------
diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk
index 8d06d9b4a669..e8c1d52a77d3 100644
--- a/comphelper/qa/makefile.mk
+++ b/comphelper/qa/makefile.mk
@@ -34,13 +34,6 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
.INCLUDE : $(PRJ)$/version.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/i18npool/qa/cppunit/makefile.mk b/i18npool/qa/cppunit/makefile.mk
index 0f9762161430..b228d38ef3c6 100644
--- a/i18npool/qa/cppunit/makefile.mk
+++ b/i18npool/qa/cppunit/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)
DLLPRE = # no leading "lib" on .so files
diff --git a/l10ntools/source/makefile.mk b/l10ntools/source/makefile.mk
index 56ae0c616f48..ab28ca04db7e 100644
--- a/l10ntools/source/makefile.mk
+++ b/l10ntools/source/makefile.mk
@@ -136,7 +136,6 @@ APP9STDLIBS+= \
$(TOOLSLIB) \
$(ICUINLIB) \
$(ICUUCLIB) \
- $(STLPORTLIB) \
$(SALLIB)
DEPOBJFILES=$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) $(APP6OBJS) $(APP7OBJS) $(APP8OBJS) $(APP9OBJS)
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index 0c6ecd88e56b..3475aeeca9bb 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -36,13 +36,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)
.IF "$(L10N_framework)"==""
diff --git a/sax/qa/cppunit/makefile.mk b/sax/qa/cppunit/makefile.mk
index b28f0cbac2ab..e06eca25a737 100644
--- a/sax/qa/cppunit/makefile.mk
+++ b/sax/qa/cppunit/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)
DLLPRE = # no leading "lib" on .so files
diff --git a/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx
index b736d21a7fcd..8a4f3248a06c 100644
--- a/svl/inc/svl/itemset.hxx
+++ b/svl/inc/svl/itemset.hxx
@@ -30,11 +30,7 @@
#include "svl/svldllapi.h"
-#if STLPORT_VERSION<321
-#include <stdarg.h>
-#else
#include <cstdarg> // std::va_list and friends
-#endif
#include <svl/poolitem.hxx>
#include <tools/rtti.hxx>
#include <tools/solar.h>
diff --git a/svl/qa/makefile.mk b/svl/qa/makefile.mk
index 6be2ee70fb9d..d1ea661b4272 100644
--- a/svl/qa/makefile.mk
+++ b/svl/qa/makefile.mk
@@ -35,14 +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)
-
SHL1OBJS= \
$(SLO)$/test_URIHelper.obj
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 7b2000e80307..ee7a230dc89d 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -31,9 +31,7 @@
#include <string.h>
-#if STLPORT_VERSION>=321
#include <cstdarg>
-#endif
#define _SVSTDARR_USHORTS
#define _SVSTDARR_ULONGS
diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk
index f8cca035e01c..e82b39337ac2 100644
--- a/tools/qa/makefile.mk
+++ b/tools/qa/makefile.mk
@@ -32,13 +32,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)
DLLPRE = # no leading "lib" on .so files
diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk
index 74811aba6204..fa9af02ca75f 100644
--- a/vcl/source/glyphs/makefile.mk
+++ b/vcl/source/glyphs/makefile.mk
@@ -64,8 +64,6 @@ SLOFILES+= $(SLO)$/graphite_adaptors.obj \
.IF "$(ENABLE_GRAPHITE)" == "TRUE"
# Graphite support on non-UNX platforms
-# make use of stlport headerfiles
-EXT_USE_STLPORT=TRUE
SLOFILES=\
$(SLO)$/graphite_textsrc.obj \
$(SLO)$/graphite_cache.obj \
diff --git a/vcl/util/makefile2.pmk b/vcl/util/makefile2.pmk
index ac2977ca8eab..ce1f2a31bd65 100644
--- a/vcl/util/makefile2.pmk
+++ b/vcl/util/makefile2.pmk
@@ -32,10 +32,3 @@ VISIBILITY_HIDDEN=TRUE
.IF "$(GUIBASE)"=="aqua"
CFLAGSCXX+=$(OBJCXXFLAGS)
.ENDIF # "$(GUIBASE)"=="aqua"
-
-#building with stlport, but graphite was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_GRAPHITE)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
generated by cgit (git 2.34.1) at 2024-07-07 12:27:33 +0000