[Libreoffice-commits] .: avmedia/source basic/source desktop/source

[Tor Lillqvist]

 avmedia/source/gstreamer/gstframegrabber.cxx |    1 -
 avmedia/source/win/framegrabber.cxx          |    1 -
 avmedia/source/win/player.cxx                |    1 -
 avmedia/source/win/window.cxx                |    1 -
 basic/source/app/process.cxx                 |    5 ++---
 basic/source/runtime/methods.cxx             |    1 -
 desktop/source/app/appsys.cxx                |    1 -
 desktop/source/app/lockfile.cxx              |    1 -
 8 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 18ac748cf879cdae66ea9a86bf19f66be41f7fdb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Feb 9 00:56:37 2011 +0200

    prewin.h already includes <windows.h>

diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 60abcb5..e0b161c 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 852a291..9633aa7 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 afafc25..f44f22f 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 05bbfbd..ca66b0e 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 5e7a78d..91e28de 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 8e5f356..ce96f66 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 5c1f218..889ff29 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 cbeb474..c2b2b1b 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>