Alexandre Julliard : kernel32: Don't include kernel_private. h in 16-bit files.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3a04f5abfce8abd69c0fbc9b48ac3c0a636f1cf8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3a04f5abfce8abd69c0fbc9b48...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Dec 28 22:59:24 2009 +0100

kernel32: Don't include kernel_private.h in 16-bit files.

---

 dlls/kernel32/dosmem.c     |    1 -
 dlls/kernel32/global16.c   |    1 -
 dlls/kernel32/instr.c      |    1 -
 dlls/kernel32/kernel16.c   |    1 -
 dlls/kernel32/local16.c    |    1 -
 dlls/kernel32/ne_module.c  |    1 -
 dlls/kernel32/ne_segment.c |    1 -
 dlls/kernel32/relay16.c    |    1 -
 dlls/kernel32/snoop16.c    |    1 -
 dlls/kernel32/syslevel.c   |    1 -
 dlls/kernel32/task.c       |    1 -
 dlls/kernel32/thunk.c      |    1 -
 dlls/kernel32/vxd.c        |    2 +-
 dlls/kernel32/wowthunk.c   |    1 -
 14 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c
index 178ed07..5e84d23 100644
--- a/dlls/kernel32/dosmem.c
+++ b/dlls/kernel32/dosmem.c
@@ -37,7 +37,6 @@
 #include "winternl.h"
 #include "wine/winbase16.h"
 
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/debug.h"
 
diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c
index 4c29389..f0d1af7 100644
--- a/dlls/kernel32/global16.c
+++ b/dlls/kernel32/global16.c
@@ -39,7 +39,6 @@
 
 #include "wine/winbase16.h"
 #include "winternl.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/debug.h"
 
diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c
index 7f5ddc4..c3aea2d 100644
--- a/dlls/kernel32/instr.c
+++ b/dlls/kernel32/instr.c
@@ -33,7 +33,6 @@
 #include "wine/winuser16.h"
 #include "excpt.h"
 #include "wine/debug.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/exception.h"
 
diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c
index 77cbd57..fabe2d8 100644
--- a/dlls/kernel32/kernel16.c
+++ b/dlls/kernel32/kernel16.c
@@ -27,7 +27,6 @@
 #include "wownt32.h"
 #include "wine/winuser16.h"
 
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/debug.h"
 
diff --git a/dlls/kernel32/local16.c b/dlls/kernel32/local16.c
index 3470b31..3eaa6ec 100644
--- a/dlls/kernel32/local16.c
+++ b/dlls/kernel32/local16.c
@@ -36,7 +36,6 @@
 #include "wine/winbase16.h"
 #include "wownt32.h"
 #include "winternl.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/debug.h"
 
diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c
index 273eb9e..51e2eb5 100644
--- a/dlls/kernel32/ne_module.c
+++ b/dlls/kernel32/ne_module.c
@@ -36,7 +36,6 @@
 #include "wine/winbase16.h"
 #include "wownt32.h"
 #include "winternl.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/exception.h"
 #include "wine/debug.h"
diff --git a/dlls/kernel32/ne_segment.c b/dlls/kernel32/ne_segment.c
index 4bc6603..48910e4 100644
--- a/dlls/kernel32/ne_segment.c
+++ b/dlls/kernel32/ne_segment.c
@@ -37,7 +37,6 @@
 #include "wownt32.h"
 #include "winternl.h"
 #include "wine/library.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/debug.h"
 
diff --git a/dlls/kernel32/relay16.c b/dlls/kernel32/relay16.c
index f5a710f..d7151ac 100644
--- a/dlls/kernel32/relay16.c
+++ b/dlls/kernel32/relay16.c
@@ -32,7 +32,6 @@
 #include "winbase.h"
 #include "wine/winbase16.h"
 #include "winternl.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/unicode.h"
 #include "wine/library.h"
diff --git a/dlls/kernel32/snoop16.c b/dlls/kernel32/snoop16.c
index efa20cd..c6c3032 100644
--- a/dlls/kernel32/snoop16.c
+++ b/dlls/kernel32/snoop16.c
@@ -31,7 +31,6 @@
 #include "wine/winbase16.h"
 #include "winternl.h"
 #include "wine/library.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/debug.h"
 
diff --git a/dlls/kernel32/syslevel.c b/dlls/kernel32/syslevel.c
index 46fdf9a..b37ec7b 100644
--- a/dlls/kernel32/syslevel.c
+++ b/dlls/kernel32/syslevel.c
@@ -29,7 +29,6 @@
 #include "winbase.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/library.h"
 #include "wine/debug.h"
diff --git a/dlls/kernel32/task.c b/dlls/kernel32/task.c
index 1bcf211..06f9d94 100644
--- a/dlls/kernel32/task.c
+++ b/dlls/kernel32/task.c
@@ -38,7 +38,6 @@
 
 #include "wine/winbase16.h"
 #include "winternl.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 
 #include "wine/debug.h"
diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c
index e03d858..fc9c3b4 100644
--- a/dlls/kernel32/thunk.c
+++ b/dlls/kernel32/thunk.c
@@ -42,7 +42,6 @@
 
 #include "wine/debug.h"
 #include "wine/library.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(thunk);
diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c
index d8b8dc3..d7b05a8 100644
--- a/dlls/kernel32/vxd.c
+++ b/dlls/kernel32/vxd.c
@@ -39,7 +39,6 @@
 #include "winerror.h"
 #include "winternl.h"
 #include "winioctl.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/library.h"
 #include "wine/unicode.h"
@@ -49,6 +48,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(vxd);
 
 typedef DWORD (WINAPI *VxDCallProc)(DWORD, CONTEXT86 *);
+typedef BOOL (WINAPI *DeviceIoProc)(DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPOVERLAPPED);
 
 struct vxd_module
 {
diff --git a/dlls/kernel32/wowthunk.c b/dlls/kernel32/wowthunk.c
index 080ce3a..5dbb4ee 100644
--- a/dlls/kernel32/wowthunk.c
+++ b/dlls/kernel32/wowthunk.c
@@ -32,7 +32,6 @@
 #include "wownt32.h"
 #include "excpt.h"
 #include "winternl.h"
-#include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/exception.h"
 #include "wine/debug.h"