diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-02-09 00:56:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-02-09 01:03:32 +0200 |
| commit | a69aca13ee5d94250001b534040cfe9f4880a0f0 (patch) | |
| tree | 2e765b8de0f024f0cac4b3b7b887667b55e77ce2 | |
| parent | 25a8c84fc4055a8d73f94f042db0f6d3f90f34e4 (diff) | |
prewin.h already includes <windows.h>
| -rw-r--r-- | avmedia/source/gstreamer/gstframegrabber.cxx | 1 | ||||
| -rw-r--r-- | avmedia/source/win/framegrabber.cxx | 1 | ||||
| -rw-r--r-- | avmedia/source/win/player.cxx | 1 | ||||
| -rw-r--r-- | avmedia/source/win/window.cxx | 1 | ||||
| -rw-r--r-- | basic/source/app/process.cxx | 5 | ||||
| -rw-r--r-- | basic/source/runtime/methods.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/appsys.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/app/lockfile.cxx | 1 |
8 files changed, 2 insertions, 10 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 60abcb5201f5..e0b161c483fc 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include <prewin.h> -#include <windows.h> #include <objbase.h> #include <strmif.h> #include <Amvideo.h> diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 195319e463a5..4f8a20475d79 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -31,7 +31,6 @@ #pragma warning(push, 1) #pragma warning(disable: 4917) #endif -#include <windows.h> #include <objbase.h> #include <strmif.h> #include <Amvideo.h> diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index f05160944251..d80472049bf2 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -31,7 +31,6 @@ #pragma warning(push, 1) #pragma warning(disable: 4917) #endif -#include <windows.h> #include <objbase.h> #include <strmif.h> #include <control.h> diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index 7b7b5c8061a7..f8ddd7866098 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -31,7 +31,6 @@ #pragma warning(push, 1) #pragma warning(disable: 4917) #endif -#include <windows.h> #include <objbase.h> #include <strmif.h> #include <control.h> diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx index 5e7a78d05abf..91e28de22a6a 100644 --- a/basic/source/app/process.cxx +++ b/basic/source/app/process.cxx @@ -31,9 +31,8 @@ #ifdef WNT -#include <prewin.h> -#include "winbase.h" -#include <postwin.h> +#include <prewin.h> +#include <postwin.h> #endif #include <tools/errcode.hxx> #include <basic/sbxcore.hxx> diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 4c7c9e7b87e9..b5967ff4dc11 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -53,7 +53,6 @@ #include "sbunoobj.hxx" #ifdef WNT #include <prewin.h> -#include "winbase.h" #include <postwin.h> #include <tools/fsys.hxx> #else diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx index 7c350b4d5a7b..010a98d36625 100644 --- a/desktop/source/app/appsys.cxx +++ b/desktop/source/app/appsys.cxx @@ -36,7 +36,6 @@ #include <rtl/ustring.hxx> #include <tools/solar.h> #include <prewin.h> -#include <winreg.h> #include <postwin.h> #include <tools/urlobj.hxx> diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx index 931a0921fb14..5e534f2b2107 100644 --- a/desktop/source/app/lockfile.cxx +++ b/desktop/source/app/lockfile.cxx @@ -32,7 +32,6 @@ #include <time.h> #ifdef WNT #include <prewin.h> -#include <windows.h> #include <postwin.h> #else #include <unistd.h> |