From a80b9d4b622d672c95800c6a3d4b46b0ef5ecfa4 Mon Sep 17 00:00:00 2001
From: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Mon, 28 Mar 2011 12:54:35 +0200
Subject: Fix basic Windows build

---
 basic/source/app/process.cxx         |  4 ++++
 basic/source/runtime/dllmgr-none.cxx |  1 +
 basic/source/runtime/dllmgr-x64.cxx  |  1 +
 basic/source/runtime/dllmgr-x86.cxx  |  1 +
 basic/source/runtime/methods.cxx     | 13 ++++++++-----
 basic/source/sbx/sbxdec.hxx          |  3 +++
 6 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'basic')

diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 7d507ecb3f33..46b663e9d93f 100755
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -39,6 +39,10 @@
 #include <basic/ttstrhlp.hxx>
 #include <basic/process.hxx>
 
+#ifdef WNT
+#include <windows.h>
+#endif
+
 Process::Process()
 : m_nArgumentCount( 0 )
 , m_pArgumentList( NULL )
diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index e893cd3fb8b5..bde3db062116 100755
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
@@ -31,6 +31,7 @@
 
 #if defined(WNT)
 #include <windows.h>
+#undef GetObject
 #endif
 
 #include <algorithm>
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index dc774f17bfb0..f38e587a3fa0 100755
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -31,6 +31,7 @@
 
 #if defined(WNT)
 #include <windows.h>
+#undef GetObject
 #endif
 
 #include <algorithm>
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 8650a4699dba..5b47511db11e 100755
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -31,6 +31,7 @@
 
 #if defined(WNT)
 #include <windows.h>
+#undef GetObject
 #endif
 
 #include <algorithm>
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index eebb2e133449..1e79e3e22da5 100755
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -110,15 +110,18 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
 #include <unistd.h>
 #endif
 
-#ifdef WNT
-#include <io.h>
-#endif
-
-
 #include <basic/sbobjmod.hxx>
 
 #include <basic/sbobjmod.hxx>
 
+#ifdef WNT
+#define GradientStyle_RECT BLA_GradientStyle_RECT
+#include <windows.h>
+#include <io.h>
+#undef GetObject
+#undef GradientSyle_RECT
+#endif
+
 static void FilterWhiteSpace( String& rStr )
 {
     rStr.EraseAllChars( ' ' );
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index 45dc041a0b7d..533ffb9aebb9 100755
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -35,6 +35,9 @@
 #undef WB_LEFT
 #undef WB_RIGHT
 
+#include <prewin.h>
+#include <postwin.h>
+
 #ifndef __MINGW32__
 #include <comutil.h>
 #endif
-- 
cgit