From e8f61c45dbc63e6ee366201baa276fd5406fcc3b Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 25 Dec 2013 10:21:22 +0000
Subject: [PATCH] [USBSTOR] * A better way of handling GUIDs thanks to Timo.
 CORE-7716

svn path=/trunk/; revision=61393
---
 reactos/drivers/usb/usbstor/CMakeLists.txt | 2 +-
 reactos/drivers/usb/usbstor/guid.c         | 9 +++++++++
 reactos/drivers/usb/usbstor/usbstor.h      | 2 --
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 reactos/drivers/usb/usbstor/guid.c

diff --git a/reactos/drivers/usb/usbstor/CMakeLists.txt b/reactos/drivers/usb/usbstor/CMakeLists.txt
index 04a35004942..ad23d41ef8a 100644
--- a/reactos/drivers/usb/usbstor/CMakeLists.txt
+++ b/reactos/drivers/usb/usbstor/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-DDEBUG_MODE)
 
 include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
 
-add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c error.c scsi.c usbstor.c usbstor.rc)
+add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c error.c scsi.c usbstor.c guid.c usbstor.rc)
 
 set_module_type(usbstor kernelmodedriver)
 add_importlibs(usbstor ntoskrnl hal usbd)
diff --git a/reactos/drivers/usb/usbstor/guid.c b/reactos/drivers/usb/usbstor/guid.c
new file mode 100644
index 00000000000..2fd41c6e0b5
--- /dev/null
+++ b/reactos/drivers/usb/usbstor/guid.c
@@ -0,0 +1,9 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <ntdef.h>
+#include <miniport.h>
+#include <usb.h>
+#include <initguid.h>
+#include <usbbusif.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
diff --git a/reactos/drivers/usb/usbstor/usbstor.h b/reactos/drivers/usb/usbstor/usbstor.h
index fa2dbc2a8bb..2da1b1a8486 100644
--- a/reactos/drivers/usb/usbstor/usbstor.h
+++ b/reactos/drivers/usb/usbstor/usbstor.h
@@ -1,8 +1,6 @@
 
 #pragma once
 
-#define INITGUID
-
 #include <ntddk.h>
 #include <usbdi.h>
 #include <hubbusif.h>