[ros-diffs] [sginsberg] 37669: - Ksuser: Cleanup header usage a bit, and make sure NTSTATUS gets defined - Kernel32: Undefine IOCTL_SERIAL_LSRMST_INSERT so we don't get a (bogus) incompatible redefinition warning

[sginsberg at svn.reactos.org]

Author: sginsberg
Date: Wed Nov 26 13:04:55 2008
New Revision: 37669

URL: http://svn.reactos.org/svn/reactos?rev=37669&view=rev
Log:
- Ksuser: Cleanup header usage a bit, and make sure NTSTATUS gets defined
- Kernel32: Undefine IOCTL_SERIAL_LSRMST_INSERT so we don't get a (bogus) incompatible redefinition warning

Modified:
    trunk/reactos/dll/directx/ksuser/ksuser.c
    trunk/reactos/dll/directx/ksuser/ksuser.h
    trunk/reactos/dll/win32/kernel32/misc/comm.c

Modified: trunk/reactos/dll/directx/ksuser/ksuser.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.c?rev=37669&r1=37668&r2=37669&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Wed Nov 26 13:04:55 2008
@@ -20,6 +20,8 @@
 
 
 #include "ksuser.h"
+#define NDEBUG
+#include <debug.h>
 
 NTSTATUS NTAPI  KsiCreateObjectType( HANDLE hHandle, PVOID guidstr, PVOID Buffer, ULONG BufferSize, ACCESS_MASK DesiredAccess, PHANDLE phHandle);
 

Modified: trunk/reactos/dll/directx/ksuser/ksuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.h?rev=37669&r1=37668&r2=37669&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] Wed Nov 26 13:04:55 2008
@@ -1,15 +1,5 @@
-
-
-
 #define _KSDDK_
 #include <windows.h>
+#include <ntsecapi.h>
+#include <ks.h>
 #include <reactos/helper.h>
-
-
-
-#include <ks.h>
-#include <debug.h>
-
-
-
-

Modified: trunk/reactos/dll/win32/kernel32/misc/comm.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/comm.c?rev=37669&r1=37668&r2=37669&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/comm.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/misc/comm.c [iso-8859-1] Wed Nov 26 13:04:55 2008
@@ -38,6 +38,7 @@
 #undef SERIAL_IOC_MCR_OUT1
 #undef SERIAL_IOC_MCR_OUT2
 #undef SERIAL_IOC_MCR_LOOP
+#undef IOCTL_SERIAL_LSRMST_INSERT
 #include <ntddser.h>
 
 #define NDEBUG