diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-25 23:57:35 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-25 23:57:35 +0100 |
| commit | 0ba7fc320d66928fd13ebb86e8f7391272989f44 (patch) | |
| tree | 821c4f077cbcc5a9c5940764ec1da48dcce00b6d /tools | |
| parent | 2fb8d0d4029022bd40f13a018fe91724bceeab19 (diff) | |
Fix Windows build of tools
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/datetime/tdate.cxx | 8 | ||||
| -rw-r--r-- | tools/source/datetime/ttime.cxx | 8 | ||||
| -rw-r--r-- | tools/source/debug/debug.cxx | 8 | ||||
| -rwxr-xr-x | tools/source/fsys/dirent.cxx | 4 | ||||
| -rwxr-xr-x | tools/source/fsys/wntmsc.hxx | 9 | ||||
| -rw-r--r-- | tools/source/stream/strmwnt.cxx | 4 | ||||
| -rw-r--r-- | tools/win/source/dll/toolsdll.cxx | 2 |
7 files changed, 12 insertions, 31 deletions
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx index fcd739bfda68..5a5c524dd80d 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 a7efa63c9290..5f12c47c54ad 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 7f28c58a5390..72799c291e9c 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 edfd1c2a055f..b9882bad50a1 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 beeac31ef6fe..ba88e4eaf020 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 62ed9e2df6c8..0e2caca40f62 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 fe104751c81e..df829745db01 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> |