Remove --with-stlport from LO 4.0

The STLport was only built for the benefit of old extensions on platforms that
once used it themselves (Linux x86, Solaris x86 and SPARC, Windows).  We
deliberately break such old extensions for LO 4.0 by no longer shipping that
backwards-compatiblity cludge.

Keeps STLport listed in readlicense_oo/ because of
o3tl/inc/o3tl/compat_functionality.hxx.

Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?).

Removes a spurious #define MOVEFILE_REPLACE_EXISTING 0x01 from
l10ntools/inc/helpmerge.hxx that was once added with
854812584862d0609b695682d2bfea2667d75c00 "INTEGRATION: CWS extensionl10nfix01
(1.11.6); FILE MERGED: 2008/06/26 13:56:03 ihi 1.11.6.1: #i90987# windows rename
-> MoveFileEx" but now starts to cause trouble on Windows.  Also disables
warning C4005 about redefinition of WB_LEFT/RIGHT macros (defined in both
tools/wintypes.hxx and the Windows API) in a number of places that include
windows.h -- however the old STLport caused those warnings to not show.

Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829

8 files changed, 1 insertions, 22 deletions

diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index 6bb3a58d956b..b0354f775718 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -21,7 +21,6 @@ static const Path JAVA_HOME;
 static const Path UPD;
 static const String LIBXML_CFLAGS;
 static const String OS;
-static const String STLPORT_VER;
 static const Bool DEBUG;
 static const Bool PRODUCT;
 
@@ -70,7 +69,6 @@ namespace gb
     static const Path SDKDIR;
 };
 
-// GXX_INCLUDE_PATH (Linux)
 // PTHREAD_CFLAGS (Linux)
 // SYSTEM_ICU (Linux)
 // SYSTEM_JPEG (Linux)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 5898cde07517..1970d54f6017 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -40,7 +40,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
 # SOLARLIB
 # UPD
 
-# GXX_INCLUDE_PATH (Linux)
 # PTHREAD_CFLAGS (Linux)
 # SYSTEM_ICU (Linux)
 # SYSTEM_JPEG (Linux)
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 123a7967f2f2..b9edab02d354 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -40,10 +40,6 @@ gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700)
 
 gb_RC := $(WINDRES)
 
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
 gb_COMPILERDEFS += \
 	-D_MT \
 	-D_NATIVE_WCHAR_T_DEFINED \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 3eca80eaa2a6..8709c3684b9c 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -57,7 +57,6 @@ gb_CPPU_ENV := gcc3
 gb_COMPILERDEFS := \
 	-D$(COM) \
 	-DCPPU_ENV=$(gb_CPPU_ENV) \
-	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
 
 gb_CFLAGS_COMMON := \
 	-Wall \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 2768fc50d867..1ae3f3cc73f0 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -59,10 +59,6 @@ gb_OSDEFS := \
 	-DUNX \
 	$(PTHREAD_CFLAGS) \
 
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
 gb_CFLAGS := \
 	$(gb_CFLAGS_COMMON) \
 	-fPIC \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d6b67be03c30..eaa567e9c431 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -44,10 +44,6 @@ gb_OSDEFS := \
 	-DUNX \
 	$(PTHREAD_CFLAGS) \
 
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
 gb_CFLAGS := \
 	$(gb_CFLAGS_COMMON) \
 	-fPIC \
diff --git a/solenv/inc/prewin.h b/solenv/inc/prewin.h
index c7041b08fad4..837dfa093872 100644
--- a/solenv/inc/prewin.h
+++ b/solenv/inc/prewin.h
@@ -46,6 +46,7 @@ extern "C" {
 #endif
 #ifdef _MSC_VER
 #pragma warning(push, 1)
+#pragma warning (disable: 4005)
 #endif
 #include <windows.h>
 #ifdef _MSC_VER
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 6ab521137d30..dbb513d2e06a 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1030,12 +1030,6 @@ COMID=$(COM)
 .ENDIF "$(USE_JAVAVER)"!=""
 .ENDIF			# "$(SOLAR_JAVA)"=="TRUE"
 
-.IF "$(COM)"=="GCC"
-GXX_INCLUDE_PATH*:=$(COMPATH)/include/c++/$(CCVER)
-.EXPORT : GXX_INCLUDE_PATH
-CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
-.ENDIF
-
 # --- extend new environment ----------------------------------
 CDEFS+= -DSUPD=$(UPD)