diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-13 16:52:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-17 16:34:23 +0100 |
| commit | 77d3777c8934171a9557a96872d020cf12443fb9 (patch) | |
| tree | 405281132307da4125f32651aee78e19ed47b34b /solenv/inc | |
| parent | c075b8068bff1b3c6025638aaf0acab5bbebab4d (diff) | |
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
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/prewin.h | 1 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 6 |
2 files changed, 1 insertions, 6 deletions
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) |