[Libreoffice-commits] .: tools/source tools/win

[Fridrich Strba]

 tools/source/datetime/tdate.cxx   |    8 +-------
 tools/source/datetime/ttime.cxx   |    8 +-------
 tools/source/debug/debug.cxx      |    8 +-------
 tools/source/fsys/dirent.cxx      |    4 ++++
 tools/source/fsys/wntmsc.hxx      |    9 +--------
 tools/source/stream/strmwnt.cxx   |    4 +++-
 tools/win/source/dll/toolsdll.cxx |    2 +-
 7 files changed, 12 insertions(+), 31 deletions(-)

New commits:
commit 6f1dd02d09615b30409ddd89f8248c18a8c5ca54
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 25 23:57:35 2011 +0100

    Fix Windows build of tools

diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 33edffd..37f619c 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -33,13 +33,7 @@
 #define INCL_DOSDATETIME
 #include <svpm.h>
 #elif defined( WNT )
-#ifdef _MSC_VER
-#pragma warning (push,1)
-#endif
-#include <tools/svwin.h>
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
+#include <windows.h>
 #else
 #include <time.h>
 #endif
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index e893b8b..ab28433 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -36,13 +36,7 @@
 #define INCL_DOSDATETIME
 #include <svpm.h>
 #elif defined( WNT )
-#ifdef _MSC_VER
-#pragma warning (push,1)
-#endif
-#include <tools/svwin.h>
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
+#include <windows.h>
 #elif defined UNX
 #include <unistd.h>
 #include <limits.h>
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 36342ad..167d8fd 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -52,13 +52,7 @@
 #endif
 
 #if defined ( WNT )
-#ifdef _MSC_VER
-#pragma warning (push,1)
-#endif
-#include <tools/svwin.h>
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
+#include <windows.h>
 #endif
 
 #include <tools/debug.hxx>
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 0ee1957..060cea2 100755
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -30,6 +30,10 @@
 #include "precompiled_tools.hxx"
 
 #if !defined UNX
+#ifdef WNT
+#include <windows.h>
+#undef GetObject
+#endif
 #include <io.h>
 #include <process.h>
 #endif
diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index ef26a52..d50e969 100755
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -38,14 +38,7 @@
 #include <sys\stat.h>
 #include <direct.h>
 
-#include <tools/svwin.h>
-#ifdef _MSC_VER
-#pragma warning (push,1)
-#endif
-#include <winbase.h>
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
+#include <windows.h>
 #include <tools/solar.h>
 
 #include <tools/string.hxx>
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index 31c282a..ba3c691 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -35,7 +35,9 @@
 #include <string.h>
 #include <limits.h>
 
-#include <tools/svwin.h>
+#ifdef WNT
+#include <windows.h>
+#endif
 
 #include <tools/debug.hxx>
 #include <tools/fsys.hxx>
diff --git a/tools/win/source/dll/toolsdll.cxx b/tools/win/source/dll/toolsdll.cxx
index 4916e4b..e777f2c 100644
--- a/tools/win/source/dll/toolsdll.cxx
+++ b/tools/win/source/dll/toolsdll.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_tools.hxx"
-#include <tools/svwin.h>
+#include <windows.h>
 #include <dll.hxx>
 #include <tools/shl.hxx>