[ros-diffs] [akhaldi] 61943: [CDROM] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Feb  3 10:35:35 2014
New Revision: 61943

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

Modified:
    trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt
    trunk/reactos/drivers/storage/class/cdrom/cdrom.c
    trunk/reactos/drivers/storage/class/cdrom/findscsi.c
    trunk/reactos/drivers/storage/class/cdrom/precomp.h

Modified: trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt	[iso-8859-1] Mon Feb  3
10:35:35 2014
@@ -1,5 +1,5 @@
 
-include_directories(..)
+include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class)
 
 add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc)
 

Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom/cdrom.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c	[iso-8859-1] Mon Feb  3 10:35:35
2014
@@ -7,6 +7,13 @@
  */
 
 #include "precomp.h"
+
+#include <ntddk.h>
+#include <scsi.h>
+#include <ntdddisk.h>
+#include <ntddcdrm.h>
+#include <include/class2.h>
+#include <stdio.h>
 
 //#define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/drivers/storage/class/cdrom/findscsi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom/findscsi.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom/findscsi.c	[iso-8859-1] Mon Feb  3 10:35:35
2014
@@ -306,4 +306,3 @@
 #endif
    return (STATUS_OBJECT_PATH_NOT_FOUND);
 }
-

Modified: trunk/reactos/drivers/storage/class/cdrom/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom/precomp.h	[iso-8859-1] Mon Feb  3 10:35:35
2014
@@ -1,7 +1,2 @@
-#include <ntddk.h>
-#include <scsi.h>
-#include <ntddscsi.h>
-#include <ntdddisk.h>
-#include <ntddcdrm.h>
-#include <include/class2.h>
-#include <stdio.h>
+#include <ntdef.h>
+#include <ntstatus.h>