summaryrefslogtreecommitdiff
path: root/shell/inc
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-05-21 16:26:08 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-05-21 16:26:08 +0300
commit11c71842f6d73f80cc40d2752421eec9af40bb51 (patch)
treed6de27d1d9e96bae92a6b7e7db3ce661b1582afb /shell/inc
parent15083950a5c814dd5765ef49751a2700052a5a99 (diff)
Drop OS2
Diffstat (limited to 'shell/inc')
-rw-r--r--shell/inc/internal/config.hxx2
-rw-r--r--shell/inc/internal/global.hxx2
-rw-r--r--shell/inc/internal/utilities.hxx4
3 files changed, 0 insertions, 8 deletions
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index 915d26aba006..37de9ca89368 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -33,9 +33,7 @@
#pragma warning (disable : 4786 4503 4917)
#endif
-#ifndef OS2
#include <tchar.h>
-#endif
#ifdef _AMD64_
#define MODULE_NAME TEXT("shlxthdl_x64.dll")
diff --git a/shell/inc/internal/global.hxx b/shell/inc/internal/global.hxx
index 359435a79192..a87510958f08 100644
--- a/shell/inc/internal/global.hxx
+++ b/shell/inc/internal/global.hxx
@@ -32,9 +32,7 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
-#ifndef OS2
#include <windows.h>
-#endif
#if defined _MSC_VER
#pragma warning(pop)
#endif
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index fd608d6d4870..2697c8002dc6 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -33,9 +33,7 @@
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
-#ifndef OS2
#include <windows.h>
-#endif
#if defined _MSC_VER
#pragma warning(pop)
#endif
@@ -91,9 +89,7 @@ bool HasOnlySpaces(const std::wstring& String);
std::wstring getShortPathName( const std::wstring& aLongName );
-#ifndef OS2
LCID LocaleSetToLCID( const LocaleSet_t & Locale );
-#endif
//----------------------------------------------------------
#ifdef DEBUG