[ros-diffs] [hpoussin] 14874: Don't double define GUID_DEVICE_INTERFACE_ARRIVAL and GUID_DEVICE_INTERFACE_REMOVAL in include/ntos/ntpnp.h and w32api/include/ddk/wdmguid.h

[hpoussin at svn.reactos.com]

Don't double define GUID_DEVICE_INTERFACE_ARRIVAL and
GUID_DEVICE_INTERFACE_REMOVAL in include/ntos/ntpnp.h and
w32api/include/ddk/wdmguid.h
Modified: trunk/reactos/include/ntos/ntpnp.h
Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h
  _____  

Modified: trunk/reactos/include/ntos/ntpnp.h
--- trunk/reactos/include/ntos/ntpnp.h	2005-04-30 14:15:38 UTC (rev
14873)
+++ trunk/reactos/include/ntos/ntpnp.h	2005-04-30 14:36:05 UTC (rev
14874)
@@ -38,8 +38,9 @@

 DEFINE_GUID(GUID_DEVICE_HIBERNATE_VETOED, 0x61173AD9, 0x194F, 0x11D3,
0x97, 0xDC, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E);
 DEFINE_GUID(GUID_DEVICE_BATTERY, 0x72631E54, 0x78A4, 0x11D0, 0xBC,
0xF7, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A);
 DEFINE_GUID(GUID_DEVICE_SAFE_REMOVAL, 0x8FBEF967, 0xD6C5, 0x11D2, 0x97,
0xB5, 0x00, 0xA0, 0xC9, 0x40, 0x52, 0x2E);
-DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x46F0, 0x11D0,
0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
-DEFINE_GUID(GUID_DEVICE_INTERFACE_REMOVAL, 0xCB3A4005, 0x46F0, 0x11D0,
0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
+/* These GUIDs are documented, and they are defined in wdmguid.h */
+/* DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x46F0,
0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); */
+/* DEFINE_GUID(GUID_DEVICE_INTERFACE_REMOVAL, 0xCB3A4005, 0x46F0,
0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); */
 DEFINE_GUID(GUID_DEVICE_ARRIVAL, 0xCB3A4009, 0x46F0, 0x11D0, 0xB0,
0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
 DEFINE_GUID(GUID_DEVICE_ENUMERATED, 0xCB3A400A, 0x46F0, 0x11D0, 0xB0,
0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
 DEFINE_GUID(GUID_DEVICE_ENUMERATE_REQUEST, 0xCB3A400B, 0x46F0, 0x11D0,
0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F);
  _____  

Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h
--- trunk/reactos/ntoskrnl/include/ntoskrnl.h	2005-04-30 14:15:38 UTC
(rev 14873)
+++ trunk/reactos/ntoskrnl/include/ntoskrnl.h	2005-04-30 14:36:05 UTC
(rev 14874)
@@ -27,6 +27,7 @@

 #include <ddk/kefuncs.h>
 #include <ddk/pnptypes.h>
 #include <ddk/pnpfuncs.h>
+#include <ddk/wdmguid.h>
 #include <ntdll/ldr.h>
 #include <internal/ctype.h>
 #include <internal/ntoskrnl.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050430/f6c3d8f3/attachment.html