[ros-diffs] [hpoussin] 31215: Stop abusing <debug.h> by including SDK first

Author: hpoussin
Date: Fri Dec 14 18:37:21 2007
New Revision: 31215

URL: http://svn.reactos.org/svn/reactos?rev=31215&view=rev
Log:
Stop abusing <debug.h> by including SDK first

Modified:
    trunk/reactos/base/system/autochk/autochk.c
    trunk/reactos/dll/cpl/desk/classinst.c
    trunk/reactos/drivers/filesystems/vfat/vfat.h
    trunk/reactos/drivers/storage/floppy/csqrtns.c
    trunk/reactos/drivers/storage/floppy/floppy.c
    trunk/reactos/drivers/storage/floppy/hardware.c
    trunk/reactos/drivers/storage/floppy/ioctl.c
    trunk/reactos/drivers/storage/floppy/readwrite.c
    trunk/reactos/drivers/storage/ide/pciide/pciide.c
    trunk/reactos/drivers/storage/ide/pciidex/fdo.c
    trunk/reactos/drivers/storage/ide/pciidex/miniport.c
    trunk/reactos/drivers/storage/ide/pciidex/misc.c
    trunk/reactos/drivers/storage/ide/pciidex/pciidex.c
    trunk/reactos/drivers/storage/ide/pciidex/pdo.c
    trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp

Modified: trunk/reactos/base/system/autochk/autochk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch…
==============================================================================
--- trunk/reactos/base/system/autochk/autochk.c (original)
+++ trunk/reactos/base/system/autochk/autochk.c Fri Dec 14 18:37:21 2007
@@ -9,15 +9,15 @@
 
 /* INCLUDES *****************************************************************/
 
-//#define NDEBUG
-#include <debug.h>
-
 #include <stdio.h>
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
 #include <fmifs/fmifs.h>
+
+//#define NDEBUG
+#include <debug.h>
 
 /* DEFINES ******************************************************************/
 

Modified: trunk/reactos/dll/cpl/desk/classinst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/classinst.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/desk/classinst.c (original)
+++ trunk/reactos/dll/cpl/desk/classinst.c Fri Dec 14 18:37:21 2007
@@ -7,10 +7,10 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
+#include "desk.h"
+
 //#define NDEBUG
 #include <debug.h>
-
-#include "desk.h"
 
 DWORD WINAPI
 DisplayClassInstaller(

Modified: trunk/reactos/drivers/filesystems/vfat/vfat.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/v…
==============================================================================
--- trunk/reactos/drivers/filesystems/vfat/vfat.h (original)
+++ trunk/reactos/drivers/filesystems/vfat/vfat.h Fri Dec 14 18:37:21 2007
@@ -1,7 +1,7 @@
-#include <debug.h>
 #include <ntifs.h>
 #include <ntdddisk.h>
 #include <reactos/helper.h>
+#include <debug.h>
 
 #ifdef __GNUC__
 #include <ccros.h>

Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/csq…
==============================================================================
--- trunk/reactos/drivers/storage/floppy/csqrtns.c (original)
+++ trunk/reactos/drivers/storage/floppy/csqrtns.c Fri Dec 14 18:37:21 2007
@@ -38,9 +38,9 @@
  *       that my lock choice is a spin lock.
  */
 
+#include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
-#include <ntddk.h>
 
 #include "floppy.h"
 #include "csqrtns.h"

Modified: trunk/reactos/drivers/storage/floppy/floppy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo…
==============================================================================
--- trunk/reactos/drivers/storage/floppy/floppy.c (original)
+++ trunk/reactos/drivers/storage/floppy/floppy.c Fri Dec 14 18:37:21 2007
@@ -40,9 +40,9 @@
  * TODO: Media detection based on sector 1
  */
 
+#include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
-#include <ntddk.h>
 
 #include "floppy.h"
 #include "hardware.h"

Modified: trunk/reactos/drivers/storage/floppy/hardware.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/har…
==============================================================================
--- trunk/reactos/drivers/storage/floppy/hardware.c (original)
+++ trunk/reactos/drivers/storage/floppy/hardware.c Fri Dec 14 18:37:21 2007
@@ -48,9 +48,9 @@
  * TODO: Figure out the right delays in Send_Byte and Get_Byte
  */
 
+#include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
-#include <ntddk.h>
 
 #include "floppy.h"
 #include "hardware.h"

Modified: trunk/reactos/drivers/storage/floppy/ioctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/ioc…
==============================================================================
--- trunk/reactos/drivers/storage/floppy/ioctl.c (original)
+++ trunk/reactos/drivers/storage/floppy/ioctl.c Fri Dec 14 18:37:21 2007
@@ -31,9 +31,9 @@
  * TODO: Implement format
  */
 
+#include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
-#include <ntddk.h>
 
 #include "floppy.h"
 #include "hardware.h"

Modified: trunk/reactos/drivers/storage/floppy/readwrite.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea…
==============================================================================
--- trunk/reactos/drivers/storage/floppy/readwrite.c (original)
+++ trunk/reactos/drivers/storage/floppy/readwrite.c Fri Dec 14 18:37:21 2007
@@ -52,9 +52,9 @@
  * TODO: Figure out specify timings
  */
 
+#include <ntddk.h>
 #define NDEBUG
 #include <debug.h>
-#include <ntddk.h>
 
 #include "floppy.h"
 #include "csqrtns.h"

Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide…
==============================================================================
--- trunk/reactos/drivers/storage/ide/pciide/pciide.c (original)
+++ trunk/reactos/drivers/storage/ide/pciide/pciide.c Fri Dec 14 18:37:21 2007
@@ -6,10 +6,10 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
+#include "pciide.h"
+
 #define NDEBUG
 #include <debug.h>
-
-#include "pciide.h"
 
 IDE_CHANNEL_STATE NTAPI
 PciIdeChannelEnabled(

Modified: trunk/reactos/drivers/storage/ide/pciidex/fdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide…
==============================================================================
--- trunk/reactos/drivers/storage/ide/pciidex/fdo.c (original)
+++ trunk/reactos/drivers/storage/ide/pciidex/fdo.c Fri Dec 14 18:37:21 2007
@@ -6,10 +6,10 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
+#include "pciidex.h"
+
 #define NDEBUG
 #include <debug.h>
-
-#include "pciidex.h"
 
 static NTSTATUS
 GetBusInterface(

Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide…
==============================================================================
--- trunk/reactos/drivers/storage/ide/pciidex/miniport.c (original)
+++ trunk/reactos/drivers/storage/ide/pciidex/miniport.c Fri Dec 14 18:37:21 2007
@@ -6,11 +6,11 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
+#define INITGUID
+#include "pciidex.h"
+
 #define NDEBUG
 #include <debug.h>
-
-#define INITGUID
-#include "pciidex.h"
 
 static DRIVER_DISPATCH PciIdeXForwardOrIgnore;
 static NTSTATUS NTAPI

Modified: trunk/reactos/drivers/storage/ide/pciidex/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide…
==============================================================================
--- trunk/reactos/drivers/storage/ide/pciidex/misc.c (original)
+++ trunk/reactos/drivers/storage/ide/pciidex/misc.c Fri Dec 14 18:37:21 2007
@@ -6,10 +6,10 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
+#include "pciidex.h"
+
 #define NDEBUG
 #include <debug.h>
-
-#include "pciidex.h"
 
 NTSTATUS NTAPI
 PciIdeXGenericCompletion(

Modified: trunk/reactos/drivers/storage/ide/pciidex/pciidex.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide…
==============================================================================
--- trunk/reactos/drivers/storage/ide/pciidex/pciidex.c (original)
+++ trunk/reactos/drivers/storage/ide/pciidex/pciidex.c Fri Dec 14 18:37:21 2007
@@ -6,10 +6,10 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
+#include "pciidex.h"
+
 #define NDEBUG
 #include <debug.h>
-
-#include "pciidex.h"
 
 NTSTATUS NTAPI
 DriverEntry(

Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide…
==============================================================================
--- trunk/reactos/drivers/storage/ide/pciidex/pdo.c (original)
+++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c Fri Dec 14 18:37:21 2007
@@ -6,10 +6,10 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin(a)reactos.org)
  */
 
+#include "pciidex.h"
+
 #define NDEBUG
 #include <debug.h>
-
-#include "pciidex.h"
 
 static NTSTATUS
 PciIdeXPdoQueryId(

Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp (original)
+++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp Fri Dec 14 18:37:21 2007
@@ -15,8 +15,8 @@
 #define PUT_GUIDS_HERE
 
 #define INITGUID
+#include <ntddk.h>
 #include <debug.h>
-#include <ntddk.h>
 
 #include <portcls.h>