From cdcb7ec378d0f4c2bd4ca9375f919bc4f4df43d9 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Wed, 28 Jan 2004 20:55:50 +0000 Subject: [PATCH] Remove ntos.h and roskrnl.h from kernel-mode code. svn path=/trunk/; revision=7900 --- reactos/drivers/bus/acpi/include/platform/types.h | 2 +- reactos/drivers/dd/blue/blue.c | 5 +++-- reactos/drivers/fs/cdfs/fcb.c | 4 ++-- reactos/drivers/fs/ntfs/attrib.c | 3 +-- reactos/drivers/fs/ntfs/fcb.c | 8 ++++---- reactos/drivers/fs/vfat/fcb.c | 4 ++-- reactos/drivers/fs/vfat/fsctl.c | 5 ++--- reactos/drivers/fs/vfat/rw.c | 5 ++--- reactos/drivers/net/afd/include/afd.h | 1 - reactos/drivers/net/afd/makefile | 4 ++-- reactos/drivers/net/tdi/cte/string.c | 4 ++-- reactos/drivers/net/tdi/cte/stubs.c | 4 ++-- reactos/drivers/net/tdi/misc/main.c | 4 ++-- reactos/drivers/net/tdi/tdi/dereg.c | 4 ++-- reactos/drivers/net/tdi/tdi/handler.c | 4 ++-- reactos/drivers/net/tdi/tdi/obsolete.c | 4 ++-- reactos/drivers/net/tdi/tdi/stubs.c | 4 ++-- 17 files changed, 33 insertions(+), 36 deletions(-) diff --git a/reactos/drivers/bus/acpi/include/platform/types.h b/reactos/drivers/bus/acpi/include/platform/types.h index 75ef637a379..ea9905bb3b3 100644 --- a/reactos/drivers/bus/acpi/include/platform/types.h +++ b/reactos/drivers/bus/acpi/include/platform/types.h @@ -13,6 +13,6 @@ #ifndef __INCLUDE_ACPI_TYPES_H #define __INCLUDE_ACPI_TYPES_H -#include +#include #endif /* __INCLUDE_ACPI_TYPES_H */ diff --git a/reactos/drivers/dd/blue/blue.c b/reactos/drivers/dd/blue/blue.c index 06d66ffd5fe..34ce37264d2 100644 --- a/reactos/drivers/dd/blue/blue.c +++ b/reactos/drivers/dd/blue/blue.c @@ -1,4 +1,4 @@ -/* $Id: blue.c,v 1.42 2004/01/11 17:31:14 gvg Exp $ +/* $Id: blue.c,v 1.43 2004/01/28 20:51:44 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -11,7 +11,8 @@ /* INCLUDES ******************************************************************/ -#include +#include +#include #include #include #include diff --git a/reactos/drivers/fs/cdfs/fcb.c b/reactos/drivers/fs/cdfs/fcb.c index 05a9a2275b1..64000dfd4e3 100644 --- a/reactos/drivers/fs/cdfs/fcb.c +++ b/reactos/drivers/fs/cdfs/fcb.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: fcb.c,v 1.16 2003/11/13 15:25:08 ekohl Exp $ +/* $Id: fcb.c,v 1.17 2004/01/28 20:52:21 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -29,7 +29,7 @@ /* INCLUDES *****************************************************************/ #include -#include +#include #define NDEBUG #include diff --git a/reactos/drivers/fs/ntfs/attrib.c b/reactos/drivers/fs/ntfs/attrib.c index e80bd58f1a8..69c8fe0b0e0 100644 --- a/reactos/drivers/fs/ntfs/attrib.c +++ b/reactos/drivers/fs/ntfs/attrib.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: attrib.c,v 1.8 2003/11/13 15:26:34 ekohl Exp $ +/* $Id: attrib.c,v 1.9 2004/01/28 20:53:06 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -30,7 +30,6 @@ #include -#include #define NDEBUG #include diff --git a/reactos/drivers/fs/ntfs/fcb.c b/reactos/drivers/fs/ntfs/fcb.c index f640994e779..c38a7f98444 100644 --- a/reactos/drivers/fs/ntfs/fcb.c +++ b/reactos/drivers/fs/ntfs/fcb.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: fcb.c,v 1.9 2003/08/07 11:47:32 silverblade Exp $ +/* $Id: fcb.c,v 1.10 2004/01/28 20:53:06 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -28,13 +28,13 @@ /* INCLUDES *****************************************************************/ #include +#include + +#include "ntfs.h" //#define NDEBUG #include -#include - -#include "ntfs.h" /* MACROS *******************************************************************/ diff --git a/reactos/drivers/fs/vfat/fcb.c b/reactos/drivers/fs/vfat/fcb.c index 0b6a026393f..fd8b48dbda6 100644 --- a/reactos/drivers/fs/vfat/fcb.c +++ b/reactos/drivers/fs/vfat/fcb.c @@ -1,4 +1,4 @@ -/* $Id: fcb.c,v 1.36 2003/11/17 02:12:49 hyperion Exp $ +/* $Id: fcb.c,v 1.37 2004/01/28 20:53:46 ekohl Exp $ * * * FILE: drivers/fs/vfat/fcb.c @@ -13,9 +13,9 @@ /* ------------------------------------------------------- INCLUDES */ #include +#include #include #include -#include #include #define NDEBUG diff --git a/reactos/drivers/fs/vfat/fsctl.c b/reactos/drivers/fs/vfat/fsctl.c index 87fd4f30739..18761725623 100644 --- a/reactos/drivers/fs/vfat/fsctl.c +++ b/reactos/drivers/fs/vfat/fsctl.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: fsctl.c,v 1.26 2003/11/17 02:12:49 hyperion Exp $ +/* $Id: fsctl.c,v 1.27 2004/01/28 20:53:46 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -27,11 +27,10 @@ /* INCLUDES *****************************************************************/ #include +#include #include #include -#include - #define NDEBUG #include diff --git a/reactos/drivers/fs/vfat/rw.c b/reactos/drivers/fs/vfat/rw.c index 1c6ee521326..e987e65dc4e 100644 --- a/reactos/drivers/fs/vfat/rw.c +++ b/reactos/drivers/fs/vfat/rw.c @@ -1,5 +1,5 @@ -/* $Id: rw.c,v 1.63 2003/11/12 15:26:44 ekohl Exp $ +/* $Id: rw.c,v 1.64 2004/01/28 20:53:46 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -13,11 +13,10 @@ /* INCLUDES *****************************************************************/ #include +#include #include #include -#include - #define NDEBUG #include diff --git a/reactos/drivers/net/afd/include/afd.h b/reactos/drivers/net/afd/include/afd.h index 62f75753ac9..7ddde65d380 100644 --- a/reactos/drivers/net/afd/include/afd.h +++ b/reactos/drivers/net/afd/include/afd.h @@ -13,7 +13,6 @@ #include #include #include -#include #include /* Forward declarations */ diff --git a/reactos/drivers/net/afd/makefile b/reactos/drivers/net/afd/makefile index 74f7f4832d8..55e59f9950e 100644 --- a/reactos/drivers/net/afd/makefile +++ b/reactos/drivers/net/afd/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.7 2004/01/11 20:46:05 navaraf Exp $ +# $Id: makefile,v 1.8 2004/01/28 20:54:18 ekohl Exp $ PATH_TO_TOP = ../../.. @@ -6,7 +6,7 @@ TARGET_TYPE = driver TARGET_NAME = afd -TARGET_CFLAGS = -I./include -DDBG -D__USE_W32API -Werror -Wall +TARGET_CFLAGS = -I./include -DDBG -Werror -Wall TARGET_OBJECTS = \ afd/afd.o \ diff --git a/reactos/drivers/net/tdi/cte/string.c b/reactos/drivers/net/tdi/cte/string.c index 4c096f6975e..1f2ca21377b 100644 --- a/reactos/drivers/net/tdi/cte/string.c +++ b/reactos/drivers/net/tdi/cte/string.c @@ -1,7 +1,7 @@ -/* $Id: string.c,v 1.4 2003/07/10 19:54:13 chorns Exp $ +/* $Id: string.c,v 1.5 2004/01/28 20:55:18 ekohl Exp $ * */ -#include +#include /* * @unimplemented diff --git a/reactos/drivers/net/tdi/cte/stubs.c b/reactos/drivers/net/tdi/cte/stubs.c index 67c9b202b33..bf15f293dbe 100644 --- a/reactos/drivers/net/tdi/cte/stubs.c +++ b/reactos/drivers/net/tdi/cte/stubs.c @@ -1,7 +1,7 @@ -/* $Id: stubs.c,v 1.5 2003/07/10 19:54:13 chorns Exp $ +/* $Id: stubs.c,v 1.6 2004/01/28 20:55:18 ekohl Exp $ * */ -#include +#include /* diff --git a/reactos/drivers/net/tdi/misc/main.c b/reactos/drivers/net/tdi/misc/main.c index 17481360954..6b7a2e99a91 100644 --- a/reactos/drivers/net/tdi/misc/main.c +++ b/reactos/drivers/net/tdi/misc/main.c @@ -1,8 +1,8 @@ -/* $Id: main.c,v 1.4 2002/09/08 10:22:19 chorns Exp $ +/* $Id: main.c,v 1.5 2004/01/28 20:55:36 ekohl Exp $ * * DESCRIPTION: Entry point for TDI.SYS */ -#include +#include NTSTATUS STDCALL diff --git a/reactos/drivers/net/tdi/tdi/dereg.c b/reactos/drivers/net/tdi/tdi/dereg.c index 84be2277489..946ca883c79 100644 --- a/reactos/drivers/net/tdi/tdi/dereg.c +++ b/reactos/drivers/net/tdi/tdi/dereg.c @@ -1,7 +1,7 @@ -/* $Id: dereg.c,v 1.6 2003/11/14 17:13:29 weiden Exp $ +/* $Id: dereg.c,v 1.7 2004/01/28 20:55:50 ekohl Exp $ * */ -#include +#include #include /* De-/Register Action IDs for TdiDeRegister */ diff --git a/reactos/drivers/net/tdi/tdi/handler.c b/reactos/drivers/net/tdi/tdi/handler.c index c4923eee85d..cb3d35fe2be 100644 --- a/reactos/drivers/net/tdi/tdi/handler.c +++ b/reactos/drivers/net/tdi/tdi/handler.c @@ -1,8 +1,8 @@ -/* $Id: handler.c,v 1.5 2003/07/10 19:54:13 chorns Exp $ +/* $Id: handler.c,v 1.6 2004/01/28 20:55:50 ekohl Exp $ * * DESCRIPTION: Default TDI event handlers. */ -#include +#include #include diff --git a/reactos/drivers/net/tdi/tdi/obsolete.c b/reactos/drivers/net/tdi/tdi/obsolete.c index 5d924ea7ee5..5fda83fae7b 100644 --- a/reactos/drivers/net/tdi/tdi/obsolete.c +++ b/reactos/drivers/net/tdi/tdi/obsolete.c @@ -1,8 +1,8 @@ -/* $Id: obsolete.c,v 1.6 2003/07/10 19:54:13 chorns Exp $ +/* $Id: obsolete.c,v 1.7 2004/01/28 20:55:50 ekohl Exp $ * */ -#include +#include /* * @unimplemented diff --git a/reactos/drivers/net/tdi/tdi/stubs.c b/reactos/drivers/net/tdi/tdi/stubs.c index e97cfd76bd9..3c212b8f272 100644 --- a/reactos/drivers/net/tdi/tdi/stubs.c +++ b/reactos/drivers/net/tdi/tdi/stubs.c @@ -1,8 +1,8 @@ -/* $Id: stubs.c,v 1.7 2003/07/10 19:54:13 chorns Exp $ +/* $Id: stubs.c,v 1.8 2004/01/28 20:55:50 ekohl Exp $ * */ -#include +#include #include /*