Revert r46466 this time for real

[reactos.git] / reactos / dll / win32 / setupapi / setupapi_private.h

diff --git a/reactos/dll/win32/setupapi/setupapi_private.h b/reactos/dll/win32/setupapi/setupapi_private.h
index a3ff489..50c2d42 100644 (file)
--- a/reactos/dll/win32/setupapi/setupapi_private.h
+++ b/reactos/dll/win32/setupapi/setupapi_private.h
@@ -45,6 +45,11 @@
 
 #include <pseh/pseh2.h>
 
+/* This hack definition is necessary as long as setupapi 
+   depends on Wine "compatibility" headers */
+typedef ULONG RESOURCEID;
+typedef RESOURCEID *PRESOURCEID;
+
 #include <pnp_c.h>
 #include "rpc_private.h"
 #include "resource.h"
@@ -56,8 +61,6 @@
 #define SETUP_DEVICE_INFO_SET_MAGIC 0xd00ff057
 #define SETUP_CLASS_IMAGE_LIST_MAGIC 0xd00ff058
 
-#define CMP_MAGIC  0x01234567
-
 struct DeviceInterface /* Element of DeviceInfo.InterfaceListHead */
 {
     LIST_ENTRY ListEntry;