diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-02-09 00:57:41 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-02-09 01:04:21 +0200 |
commit | b14f9301ef503c922d89d6a72772c55606313ff7 (patch) | |
tree | f1ef9631a78945fb46b458bb588a1b48a1d2d3df | |
parent | add in AIX here as well (diff) | |
download | core-b14f9301ef503c922d89d6a72772c55606313ff7.tar.gz core-b14f9301ef503c922d89d6a72772c55606313ff7.zip |
prewin.h already includes <windows.h>
-rw-r--r-- | canvas/source/cairo/cairo_cairo.cxx | 1 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvas.cxx | 1 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 1 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_win32_cairo.cxx | 1 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_win32_cairo.hxx | 1 | ||||
-rw-r--r-- | l10ntools/source/directory.cxx | 1 | ||||
-rw-r--r-- | l10ntools/source/helpmerge.cxx | 5 | ||||
-rw-r--r-- | toolkit/source/awt/vclxdialog.cxx | 1 | ||||
-rw-r--r-- | toolkit/source/awt/vclxsystemdependentwindow.cxx | 1 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 1 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindow1.cxx | 1 | ||||
-rw-r--r-- | tools/qa/test_reversemap.cxx | 1 | ||||
-rw-r--r-- | vcl/source/app/settings.cxx | 5 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 1 |
14 files changed, 4 insertions, 18 deletions
diff --git a/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx index cf2ae4c4f6cb..f4b7803824ff 100644 --- a/canvas/source/cairo/cairo_cairo.cxx +++ b/canvas/source/cairo/cairo_cairo.cxx @@ -34,7 +34,6 @@ #ifdef WNT # include <prewin.h> -# include <windows.h> # include <postwin.h> #endif diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index bdccdac27f2f..a3bbd664cfc2 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -50,7 +50,6 @@ #ifdef WNT # include <prewin.h> -# include <windows.h> # include <postwin.h> #endif diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 94cbd891b83a..cae25d2c8863 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -40,7 +40,6 @@ #ifdef WNT #include <prewin.h> -#include <windows.h> #include <postwin.h> #ifdef max #undef max diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx index 6b08a293b95c..47959c47afeb 100644 --- a/canvas/source/cairo/cairo_win32_cairo.cxx +++ b/canvas/source/cairo/cairo_win32_cairo.cxx @@ -37,7 +37,6 @@ ************************************************************************/ #include <prewin.h> -#include <windows.h> #include <postwin.h> #include <osl/diagnose.h> diff --git a/canvas/source/cairo/cairo_win32_cairo.hxx b/canvas/source/cairo/cairo_win32_cairo.hxx index 66349d464b1c..c0db68576ef5 100644 --- a/canvas/source/cairo/cairo_win32_cairo.hxx +++ b/canvas/source/cairo/cairo_win32_cairo.hxx @@ -31,7 +31,6 @@ #ifdef WNT # include <prewin.h> -# include <windows.h> # include <postwin.h> #endif diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx index 38255a3841d1..dbe7f67a0b1a 100644 --- a/l10ntools/source/directory.cxx +++ b/l10ntools/source/directory.cxx @@ -103,7 +103,6 @@ void Directory::readDirectory() #ifdef WNT #include <prewin.h> -#include <windows.h> #include <postwin.h> void Directory::readDirectory ( const rtl::OUString& sFullpath ) diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index ef6baec538a2..66805fd69eb3 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -44,9 +44,8 @@ #include "rtl/strbuf.hxx" #ifdef WNT #include <direct.h> -#include "prewin.h" -#include <windows.h> -#include "postwin.h" +#include <prewin.h> +#include <postwin.h> #endif /*****************************************************************************/ diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx index c244ebe5d707..e10ffc0c237b 100644 --- a/toolkit/source/awt/vclxdialog.cxx +++ b/toolkit/source/awt/vclxdialog.cxx @@ -40,7 +40,6 @@ #ifdef WNT #include <prewin.h> -#include <windows.h> #include <postwin.h> #elif defined ( QUARTZ ) #include "premac.h" diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 25f2e8b6bd7f..df1f6d05e14c 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -42,7 +42,6 @@ #ifdef WNT #include <prewin.h> -#include <windows.h> #include <postwin.h> #elif defined ( QUARTZ ) #include "premac.h" diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 31364226abe2..6edf235670dd 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -54,7 +54,6 @@ #ifdef WNT #include <prewin.h> -#include <windows.h> #include <postwin.h> #elif (defined QUARTZ) #include "premac.h" diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 75025cd408b5..5f1640a69139 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -39,7 +39,6 @@ #ifdef WNT #include <prewin.h> -#include <windows.h> #include <postwin.h> #elif defined ( QUARTZ ) #include "premac.h" diff --git a/tools/qa/test_reversemap.cxx b/tools/qa/test_reversemap.cxx index 47ae96cf3f41..193713f81d97 100644 --- a/tools/qa/test_reversemap.cxx +++ b/tools/qa/test_reversemap.cxx @@ -28,7 +28,6 @@ #ifdef WNT # include <prewin.h> -# include <windows.h> # include <postwin.h> #endif diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 3405e30f5353..28166c0962bc 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -48,9 +48,8 @@ #include <unotools/syslocaleoptions.hxx> #ifdef WNT -#include "prewin.h" -#include <windows.h> -#include "postwin.h" +#include <prewin.h> +#include <postwin.h> #endif using namespace rtl; diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 4ae2b5199b05..b3def16e6075 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -33,7 +33,6 @@ #include <malloc.h> #include <prewin.h> -#include <windows.h> #include <postwin.h> #include <vcl/sysdata.hxx> #include "tools/svwin.h" |