diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-02-09 00:54:37 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-02-09 01:01:48 +0200 |
commit | d81f351b9ceb859c730e9cafb9145af86a3aaa6c (patch) | |
tree | fa264837c6e05c50adc4fd770ba044892316108b | |
parent | aab856b75e9a8567fa358b43af035caeefb7043e (diff) |
prewin.h already includes <windows.h>
-rw-r--r-- | automation/source/testtool/registry_win.cxx | 1 | ||||
-rw-r--r-- | extensions/source/plugin/inc/plugin/win/sysplug.hxx | 4 | ||||
-rw-r--r-- | extensions/source/plugin/win/sysplug.cxx | 15 | ||||
-rw-r--r-- | extensions/source/plugin/win/winmgr.cxx | 15 |
4 files changed, 10 insertions, 25 deletions
diff --git a/automation/source/testtool/registry_win.cxx b/automation/source/testtool/registry_win.cxx index bbfee520d752..b599342b0854 100644 --- a/automation/source/testtool/registry_win.cxx +++ b/automation/source/testtool/registry_win.cxx @@ -37,7 +37,6 @@ #include <prewin.h> -#include "winreg.h" #include <postwin.h> // as we define it ourselves further down the line we remove it here #ifdef IS_ERROR diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx index 34afd28c19bd..c90c816e45d3 100644 --- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx @@ -33,11 +33,7 @@ #pragma warning (disable:4005) #include <prewin.h> - -#include <windows.h> #include <tchar.h> -#include <winbase.h> - #include <postwin.h> #pragma pack( push, 8 ) diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index 27e1f18916d6..5e244768a980 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -34,16 +34,11 @@ #pragma warning (push,1) #pragma warning (disable:4005) - #include <prewin.h> - - #include <windows.h> - #include <string.h> - #include <tchar.h> - #include <winreg.h> - #include <winbase.h> - #include <objbase.h> - - #include <postwin.h> +#include <prewin.h> +#include <string.h> +#include <tchar.h> +#include <objbase.h> +#include <postwin.h> #pragma warning (pop) diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx index ee8929912e43..7491f5d4c5e8 100644 --- a/extensions/source/plugin/win/winmgr.cxx +++ b/extensions/source/plugin/win/winmgr.cxx @@ -43,16 +43,11 @@ #pragma warning (push,1) #pragma warning (disable:4005) - #include "prewin.h" - - #include <windows.h> - #include <string.h> - #include <tchar.h> - #include <winreg.h> - #include <winbase.h> - #include <objbase.h> - - #include "postwin.h" +#include <prewin.h> +#include <string.h> +#include <tchar.h> +#include <objbase.h> +#include <postwin.h> #pragma warning (pop) |