[ros-diffs] [akhaldi] 61523: [PCI] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. * Improve the GUIDs situation. CORE-7716

Author: akhaldi
Date: Sat Jan  4 11:06:54 2014
New Revision: 61523

URL: http://svn.reactos.org/svn/reactos?rev=61523&view=rev
Log:
[PCI]
* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
* Improve the GUIDs situation.
CORE-7716

Modified:
    trunk/reactos/drivers/bus/pci/fdo.c
    trunk/reactos/drivers/bus/pci/pci.c
    trunk/reactos/drivers/bus/pci/pci.h
    trunk/reactos/drivers/bus/pci/pdo.c

Modified: trunk/reactos/drivers/bus/pci/fdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=…
==============================================================================
--- trunk/reactos/drivers/bus/pci/fdo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pci/fdo.c	[iso-8859-1] Sat Jan  4 11:06:54 2014
@@ -9,9 +9,7 @@
 
 #include "pci.h"
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 /*** PRIVATE *****************************************************************/

Modified: trunk/reactos/drivers/bus/pci/pci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.c?rev=…
==============================================================================
--- trunk/reactos/drivers/bus/pci/pci.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pci/pci.c	[iso-8859-1] Sat Jan  4 11:06:54 2014
@@ -7,12 +7,11 @@
  *      10-09-2001  CSH  Created
  */
 
-#define INITGUID
 #include "pci.h"
 
-#ifndef NDEBUG
+#include <stdio.h>
+
 #define NDEBUG
-#endif
 #include <debug.h>
 
 static DRIVER_DISPATCH PciDispatchDeviceControl;

Modified: trunk/reactos/drivers/bus/pci/pci.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.h?rev=…
==============================================================================
--- trunk/reactos/drivers/bus/pci/pci.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pci/pci.h	[iso-8859-1] Sat Jan  4 11:06:54 2014
@@ -1,7 +1,4 @@
 #include <ntifs.h>
-#include <wdmguid.h>
-#include <stdio.h>
-#include <ntddk.h>
 
 #define TAG_PCI '0ICP'
 

Modified: trunk/reactos/drivers/bus/pci/pdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=…
==============================================================================
--- trunk/reactos/drivers/bus/pci/pdo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pci/pdo.c	[iso-8859-1] Sat Jan  4 11:06:54 2014
@@ -9,9 +9,10 @@
 
 #include "pci.h"
 
-#ifndef NDEBUG
+#include <initguid.h>
+#include <wdmguid.h>
+
 #define NDEBUG
-#endif
 #include <debug.h>
 
 /*** PRIVATE *****************************************************************/