summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scp2/inc/macros.inc2
-rw-r--r--scp2/source/ooo/common_brand.scp8
-rw-r--r--scp2/source/ooo/file_library_ooo.scp10
-rw-r--r--scp2/source/ooo/makefile.mk4
-rwxr-xr-xscp2/source/ooo/mergemodules_ooo.scp4
-rw-r--r--scp2/source/ooo/ure.scp21
-rwxr-xr-xscp2/source/winexplorerext/makefile.mk4
-rw-r--r--solenv/bin/addsym.awk4
-rw-r--r--solenv/inc/doxygen.cfg2
-rw-r--r--solenv/inc/settings.mk10
-rw-r--r--solenv/inc/unxmacx.mk3
-rw-r--r--solenv/inc/wntmsc.mk33
-rwxr-xr-xsoltools/util/makefile.pmk10
-rw-r--r--stlport/STLport-4.5.patch32
-rw-r--r--stlport/systemstlguards/postextstl.h38
-rw-r--r--stlport/systemstlguards/preextstl.h95
16 files changed, 52 insertions, 228 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 3fa2f8bda690..8bf6350d7465 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -576,7 +576,7 @@ End
#define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
#define SCP2_STDLP_DEBUG "d"
#else
#define SCP2_STDLP_DEBUG ""
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c47ce7462653..bf492dfe0ba2 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -792,7 +792,7 @@ File gid_Brand_File_Lib_Msvcr80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcr80.dll";
#else
Name = "msvcr80d.dll";
@@ -835,7 +835,7 @@ File gid_Brand_File_Lib_Msvcp80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcp80.dll";
#else
Name = "msvcp80d.dll";
@@ -852,7 +852,7 @@ File gid_Brand_File_Lib_Msvcm80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcm80.dll";
#else
Name = "msvcm80d.dll";
@@ -869,7 +869,7 @@ File gid_Brand_File_Msvcm80crt_Manifest
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "Microsoft.VC80.CRT.manifest";
#else
Name = "Microsoft.VC80.DebugCRT.manifest";
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index e30422e82b41..2349c4b484be 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -993,7 +993,7 @@ File gid_File_Lib_Msvcr80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcr80.dll";
#else
Name = "msvcr80d.dll";
@@ -1010,7 +1010,7 @@ File gid_File_Lib_Msvcp80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcp80.dll";
#else
Name = "msvcp80d.dll";
@@ -1027,7 +1027,7 @@ File gid_File_Lib_Msvcm80
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcm80.dll";
#else
Name = "msvcm80d.dll";
@@ -1070,7 +1070,7 @@ File gid_File_Msvcm80crt_Manifest
BIN_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "Microsoft.VC80.CRT.manifest";
#else
Name = "Microsoft.VC80.DebugCRT.manifest";
@@ -1782,7 +1782,7 @@ End
STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
- !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
+ !(defined M1400 && defined PROF_EDITION && !defined _DEBUG_RUNTIME)
// see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
// gid_Brand_File_Lib_Msvcr80
File gid_File_Moz_Msvcp80
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 87c680191547..b2dec77bac55 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -126,10 +126,6 @@ SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
SCPDEFS+=-DSYSTEM_DB
.ENDIF
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
.IF "$(WITH_MOZILLA)" == "NO"
SCPDEFS+=-DWITHOUT_MOZILLA
.ENDIF
diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/ooo/mergemodules_ooo.scp
index f88cce4d2314..b19ca8c47bba 100755
--- a/scp2/source/ooo/mergemodules_ooo.scp
+++ b/scp2/source/ooo/mergemodules_ooo.scp
@@ -29,7 +29,7 @@
#ifdef M1500
MergeModule gid_Mergemodule_Microsoft_Vc90_Crt_X86
-#ifdef _STLP_DEBUG
+#ifdef _DEBUG_RUNTIME
Name = "Microsoft_VC90_DebugCRT_x86.msm";
#else
Name = "Microsoft_VC90_CRT_x86.msm";
@@ -43,7 +43,7 @@ End
#ifdef M1500
MergeModule gid_Mergemodule_Policy_Microsoft_Vc90_Crt_X86
-#ifdef _STLP_DEBUG
+#ifdef _DEBUG_RUNTIME
Name = "policy_9_0_Microsoft_VC90_DebugCRT_x86.msm";
#else
Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index ce790cb058f4..cda47b44137c 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -177,7 +177,7 @@ File gid_File_Lib_Msvcr80_Ure
BIN_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcr80.dll";
#else
Name = "msvcr80d.dll";
@@ -194,7 +194,7 @@ File gid_File_Lib_Msvcp80_Ure
BIN_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcp80.dll";
#else
Name = "msvcp80d.dll";
@@ -211,7 +211,7 @@ File gid_File_Lib_Msvcm80_Ure
BIN_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "msvcm80.dll";
#else
Name = "msvcm80d.dll";
@@ -228,7 +228,7 @@ File gid_File_Msvcm80crt_Manifest_Ure
BIN_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
Name = "Microsoft.VC80.CRT.manifest";
#else
Name = "Microsoft.VC80.DebugCRT.manifest";
@@ -961,19 +961,18 @@ Unixlink gid_Unixlink_File_Dl_Libxml2
End
#endif
-#if !defined USE_SYSTEM_STL || \
- (defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64)
+#if defined WITH_STLPORT
File gid_File_Dl_Stlport
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
#if defined _gcc3 && defined WNT
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
#else
Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
#endif
#elif defined _gcc3
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug");
#else
Name = SCP2_URE_DL_NORMAL("stlport_gcc");
@@ -982,20 +981,18 @@ File gid_File_Dl_Stlport
#if defined IS_LP64
Name = SCP2_URE_DL_VER("stlport", "1");
#else
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug");
#else
Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
#endif
#endif
#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) || defined (M1600) )
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
#else
Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
#endif
-#else
-#error "stlport dynamic library: unsupported platform"
#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "D976338D-D2A5-4D29-B765-D3AC43181C7F";
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 21eaad714eac..435ed439987d 100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -50,10 +50,6 @@ PARFILES= \
registryitem_winexplorerext.par
.ENDIF
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
ULFFILES= \
module_winexplorerext.ulf
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 621ca2e4bc42..de0b57934f7f 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -37,15 +37,11 @@ END {
print "UDK_3_0_0 {"
print "global:"
print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
- if (ENVIRON["USE_SYSTEM_STL"] != "YES")
- print "_ZN4_STL7num_put*; # for STLport"
print "};"
}
}
state == 2 {
print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
- if (ENVIRON["USE_SYSTEM_STL"] != "YES")
- print "_ZN4_STL7num_put*; # for STLport"
state = 3
}
# #i66636# - ???
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index 36be3c27ba05..aa3929950063 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -1061,7 +1061,7 @@ PREDEFINED = LINUX \
GCC \
C341 \
X86_64 \
- _STLP_DEBUG \
+ _DEBUG_RUNTIME \
VER=C341 \
NPTL \
GLIBC=2 \
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index d8a92a689db8..203a44fc79f2 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -479,7 +479,7 @@ DBG_LEVEL*=0
optimize!=true
dbgutil!=true
DBG_LEVEL*=1
-USE_STLP_DEBUG*=TRUE
+USE_DEBUG_RUNTIME*=TRUE
.ENDIF
.IF "$(debug)"!=""
@@ -856,8 +856,8 @@ LIB:=$(LB);$(BIN);$(ILIB)
CPUNAME=CPUNAME_HAS_TO_BE_SET_IN_ENVIRONMENT
.ENDIF
-.IF "$(USE_STLP_DEBUG)" != ""
-SCPCDEFS+=-D_STLP_DEBUG
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+SCPCDEFS+=-D_DEBUG_RUNTIME
.ENDIF
.IF "$(UDK_MAJOR)"!=""
@@ -883,8 +883,8 @@ UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I
CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
-.IF "$(USE_STLP_DEBUG)" != "" && "$(GUI)"!="OS2"
-CDEFS+=-D_STLP_DEBUG
+.IF "$(USE_DEBUG_RUNTIME)" != "" && "$(GUI)"!="OS2"
+CDEFS+=-D_DEBUG_RUNTIME
.ENDIF
.IF "$(CDEFS_PRESET)" != ""
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 17d9422939f5..134395567966 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -39,9 +39,6 @@ LINKOUTPUT_FILTER=
# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
# compiling STLport sources too, either internally or externally.
CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
-.IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES"
-CDEFS+=-DX_LOCALE
-.ENDIF
.IF "$(GUIBASE)"=="aqua"
# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
# build can assume functions/libraries of that version to be available
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index cbe7b3ee382c..7a10abe25e02 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -296,38 +296,23 @@ LINKFLAGSOPT=
UWINAPILIB*=uwinapi.lib
.IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
LIBCMT=msvcrtd.lib
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmtd.lib
-CDEFS+=-D_DEBUG
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ENDIF # "$(DYNAMIC_CRT)"!=""
-
-.IF "$(USE_SYSTEM_STL)"=="YES"
-.IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
LIBCPMT=msvcprtd.lib
-.ELSE # "$(USE_STLP_DEBUG)" != ""
+.ELSE # "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=msvcrt.lib
LIBCPMT=msvcprt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
.ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=libcmtd.lib
LIBCPMT=libcpmtd.lib
CDEFS+=-D_DEBUG
-.ELSE # "$(USE_STLP_DEBUG)" != ""
+.ELSE # "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=libcmt.lib
LIBCPMT=libcpmt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
.ENDIF # "$(DYNAMIC_CRT)"!=""
-.ELSE # "$(USE_SYSTEM_STL)"=="YES"
-LIBCPMT=
-.ENDIF # "$(USE_SYSTEM_STL)"=="YES"
STDOBJVCL=$(L)/salmain.obj
STDOBJGUI=
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index bf51cf851b4c..003cf1c203c2 100755
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -31,14 +31,6 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend
# find 'adjustvisibility' in own output tree
ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility
-# avoid STLPort
-NO_DEFAULT_STL=TRUE
-SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC))
-.IF "$(STLPORT4)" != ""
-SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
-SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
-.ENDIF
-
.IF "$(OS)"=="SOLARIS"
# hack due to #i53089#
.IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)"
@@ -46,7 +38,5 @@ HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x"))
.ELSE # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
HELP_COMPATH:=$(COMPATH)
.ENDIF # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx"
-#SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/stlport4
-#SOLARLIB+=-L$(HELP_COMPATH)/prod/lib/stlport4
SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd
.ENDIF
diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch
index 847605338494..0a0027594ad3 100644
--- a/stlport/STLport-4.5.patch
+++ b/stlport/STLport-4.5.patch
@@ -163,8 +163,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
@@ -172,8 +172,8 @@
+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+include common_percent_rules.mak
+include common_rules.mak
@@ -255,8 +255,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2
+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -shared -O2 -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
@@ -264,8 +264,8 @@
+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g
+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+LDLIBS_RELEASE_dynamic = ${LDLIBS_COMMON_dynamic}
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${RELEASE_NAME}.map -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a
@@ -399,8 +399,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
+CFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
@@ -408,8 +408,8 @@
+CFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
+
-+CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+include common_percent_rules.mak
+include common_rules.mak
@@ -475,8 +475,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
@@ -484,8 +484,8 @@
+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+include common_percent_rules.mak
+include common_rules.mak
diff --git a/stlport/systemstlguards/postextstl.h b/stlport/systemstlguards/postextstl.h
deleted file mode 100644
index 8ab646e51e70..000000000000
--- a/stlport/systemstlguards/postextstl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifdef std_was_redefined_as_stlport
-// put things back the way they were
-# define std std_was_redefined_as_stlport
-# undef _STLP_OUTERMOST_HEADER_ID
-// force config to be re-read
-# undef _STLP_NOTHROW_INHERENTLY
-# undef _STLP_CONFIG_H
-# include <stddef.h>
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
deleted file mode 100644
index cc271936b6b6..000000000000
--- a/stlport/systemstlguards/preextstl.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-//1. Force inclusion of a std:: using header to ensure the stlport define
-//of std as "stlport"
-#include <algorithm>
-#if defined(ADAPT_EXT_STL)
-//2. Force inclusion of stlport headers to get their stlport:: definitions
-# include <ostream>
-# include <istream>
-# include <fstream>
-# include <iostream>
-# include <sstream>
-# include <vector>
-# include <deque>
-# include <set>
-# include <list>
-# include <map>
-//3. Now force inclusion of native headers to get their std:: definitions
-# if defined(std)
-# define std_was_redefined_as_stlport std
-# undef std
-# define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
-# if defined(_GNUC__)
-# pragma GCC visibility push(default)
-# endif
-//Do we still need to include exception_defines.h here, I'd prefer
-//to drop it if possible
-# if (__GNUC__ >= 5 || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)))
-# include _STLP_NATIVE_HEADER(bits/exception_defines.h)
-# else
-# include _STLP_NATIVE_HEADER(exception_defines.h)
-# endif
-# include _STLP_NATIVE_HEADER(limits)
-# if !defined(__GXX_EXPERIMENTAL_CXX0X__)
-# include _STLP_NATIVE_HEADER(memory)
-# endif
-# include _STLP_NATIVE_HEADER(exception)
-# include _STLP_NATIVE_HEADER(iosfwd)
-# if !defined(__GXX_EXPERIMENTAL_CXX0X__)
-# include _STLP_NATIVE_HEADER(algorithm)
-# include _STLP_NATIVE_HEADER(string)
-# else
-# include _STLP_NATIVE_HEADER(vector)
-# include _STLP_NATIVE_HEADER(string)
-# include _STLP_NATIVE_HEADER(numeric)
-# include _STLP_NATIVE_HEADER(functional)
-# include _STLP_NATIVE_HEADER(algorithm)
-# endif
-# include _STLP_NATIVE_HEADER(streambuf)
-# include _STLP_NATIVE_HEADER(ios)
-# include _STLP_NATIVE_HEADER(locale)
-# include _STLP_NATIVE_HEADER(stdexcept)
-# include _STLP_NATIVE_HEADER(ostream)
-# include _STLP_NATIVE_HEADER(istream)
-# include _STLP_NATIVE_HEADER(iostream)
-# include _STLP_NATIVE_HEADER(sstream)
-# include _STLP_NATIVE_HEADER(vector)
-# include _STLP_NATIVE_HEADER(deque)
-# include _STLP_NATIVE_HEADER(set)
-# include _STLP_NATIVE_HEADER(list)
-# include _STLP_NATIVE_HEADER(map)
-# if defined(_GNUC__)
-# pragma GCC visibility pop
-# endif
-# endif
-#endif
-//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
-//against regardless of whether that is stlport or system stl
-namespace ext_std = std;
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2024-08-03 15:44:09 +0000