[ros-diffs] [mjmartin] 46747: [DDK] - A better fix for r46738. Patch by Amine Khaidi.

[mjmartin at svn.reactos.org]

Author: mjmartin
Date: Tue Apr  6 15:23:33 2010
New Revision: 46747

URL: http://svn.reactos.org/svn/reactos?rev=46747&view=rev
Log:
[DDK]
- A better fix for r46738. Patch by Amine Khaidi.

Modified:
    trunk/reactos/include/ddk/hubbusif.h
    trunk/reactos/include/ddk/usbbusif.h

Modified: trunk/reactos/include/ddk/hubbusif.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hubbusif.h?rev=46747&r1=46746&r2=46747&view=diff
==============================================================================
--- trunk/reactos/include/ddk/hubbusif.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/hubbusif.h [iso-8859-1] Tue Apr  6 15:23:33 2010
@@ -1,10 +1,14 @@
 #pragma once
 
+#define _HUBBUSIF_
+
 #include "usbdi.h"
 
 #if (NTDDI_VERSION >= NTDDI_WINXP)
 
+#if !defined(_USBBUSIF_)
 typedef PVOID PUSB_DEVICE_HANDLE;
+#endif
 
 typedef struct _ROOTHUB_PDO_EXTENSION {
   ULONG Signature;

Modified: trunk/reactos/include/ddk/usbbusif.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbbusif.h?rev=46747&r1=46746&r2=46747&view=diff
==============================================================================
--- trunk/reactos/include/ddk/usbbusif.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/usbbusif.h [iso-8859-1] Tue Apr  6 15:23:33 2010
@@ -1,10 +1,16 @@
 #pragma once
+
+#define _USBBUSIF_
 
 #ifndef USB_BUSIFFN
 #define USB_BUSIFFN __stdcall
 #endif
 
 #if (NTDDI_VERSION >= NTDDI_WINXP)
+
+#if !defined(_USBBUSIF_)
+typedef PVOID PUSB_DEVICE_HANDLE;
+#endif
 
 typedef NTSTATUS
 (USB_BUSIFFN *PUSB_BUSIFFN_SUBMIT_ISO_OUT_URB) (