diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 16:26:08 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 16:26:08 +0300 |
| commit | 11c71842f6d73f80cc40d2752421eec9af40bb51 (patch) | |
| tree | d6de27d1d9e96bae92a6b7e7db3ce661b1582afb /shell/source/all | |
| parent | 15083950a5c814dd5765ef49751a2700052a5a99 (diff) | |
Drop OS2
Diffstat (limited to 'shell/source/all')
| -rwxr-xr-x | shell/source/all/makefile.mk | 5 | ||||
| -rwxr-xr-x | shell/source/all/ooofilereader/makefile.mk | 5 | ||||
| -rw-r--r-- | shell/source/all/zipfile/zipexcptn.cxx | 6 | ||||
| -rw-r--r-- | shell/source/all/zipfile/zipfile.cxx | 6 |
4 files changed, 1 insertions, 21 deletions
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk index 66b185132fa6..b4cc34a42601 100755 --- a/shell/source/all/makefile.mk +++ b/shell/source/all/makefile.mk @@ -47,9 +47,6 @@ CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS_X64+=-D_WIN32_IE=0x501 .ENDIF # "$(BUILD_X64)"!="" .ENDIF -.IF "$(GUI)" == "OS2" -CFLAGS+=-DISOLATION_AWARE_ENABLED -DXML_UNICODE -DXML_UNICODE_WCHAR_T -DUNICODE -D_UNICODE -.ENDIF # --- Files -------------------------------------------------------- @@ -58,7 +55,7 @@ CFLAGS+=-DSYSTEM_EXPAT .ENDIF SLOFILES=$(SLO)$/xml_parser.obj - + .IF "$(BUILD_X64)"!="" SLOFILES_X64=$(SLO_X64)$/xml_parser.obj .ENDIF # "$(BUILD_X64)"!="" diff --git a/shell/source/all/ooofilereader/makefile.mk b/shell/source/all/ooofilereader/makefile.mk index bf6365526eec..67d29acaaf85 100755 --- a/shell/source/all/ooofilereader/makefile.mk +++ b/shell/source/all/ooofilereader/makefile.mk @@ -36,17 +36,12 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(GUI)" != "OS2" CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS+=-D_WIN32_IE=0x501 CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS_X64+=-D_WIN32_IE=0x501 -.ENDIF -.IF "$(GUI)" == "OS2" -CFLAGS+=-DISOLATION_AWARE_ENABLED -DXML_UNICODE -DXML_UNICODE_WCHAR_T -DUNICODE -D_UNICODE -.ENDIF # --- Files -------------------------------------------------------- diff --git a/shell/source/all/zipfile/zipexcptn.cxx b/shell/source/all/zipfile/zipexcptn.cxx index c5501d5b6213..5a5dcefc16ea 100644 --- a/shell/source/all/zipfile/zipexcptn.cxx +++ b/shell/source/all/zipfile/zipexcptn.cxx @@ -84,10 +84,8 @@ Win32Exception::Win32Exception(int Error) : */ Win32Exception::~Win32Exception() throw() { -#ifndef OS2 if (m_MsgBuff) LocalFree(m_MsgBuff); -#endif } //------------------------------------------ @@ -95,9 +93,6 @@ Win32Exception::~Win32Exception() throw() */ const char* Win32Exception::what() const throw() { -#ifdef OS2 - return "Win32Exception!"; -#else FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | @@ -110,7 +105,6 @@ const char* Win32Exception::what() const throw() NULL); return reinterpret_cast<char*>(m_MsgBuff); -#endif } //------------------------------------------ diff --git a/shell/source/all/zipfile/zipfile.cxx b/shell/source/all/zipfile/zipfile.cxx index 0b4ac7fd7fc2..c7ed65e5d177 100644 --- a/shell/source/all/zipfile/zipfile.cxx +++ b/shell/source/all/zipfile/zipfile.cxx @@ -38,12 +38,6 @@ #include <string.h> -#ifdef OS2 -#include <alloca.h> -#define _alloca alloca -#define ERROR_NOT_ENOUGH_MEMORY 8 -#endif - namespace internal { /* for case in-sensitive string comparison */ |