Changed GUID_DEFINED to _GUID_DEFINED for compatibility (prevent conflict) with mingw...

[reactos.git] / reactos / include / ddk / pnptypes.h

diff --git a/reactos/include/ddk/pnptypes.h b/reactos/include/ddk/pnptypes.h
index 4c7a71b..2ba5453 100644 (file)
--- a/reactos/include/ddk/pnptypes.h
+++ b/reactos/include/ddk/pnptypes.h
@@ -5,8 +5,8 @@ struct _DEVICE_OBJECT;
 struct _FILE_OBJECT;
 
 // windows.h may be included before
-#ifndef GUID_DEFINED
-#define GUID_DEFINED
+#ifndef _GUID_DEFINED
+#define _GUID_DEFINED
 
 typedef struct _GUID {
   ULONG Data1;
@@ -148,15 +148,13 @@ typedef enum _IO_NOTIFICATION_EVENT_CATEGORY {
 } IO_NOTIFICATION_EVENT_CATEGORY;
 
 // CallbackRoutine for IoRegisterPlugPlayNotification
-typedef
-NTSTATUS
+typedef NTSTATUS STDCALL
 (*PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(
   IN PVOID NotificationStructure,
   IN PVOID Context);
 
 // Callback for IoReportTargetDeviceChangeAsynchronous
-typedef
-VOID
+typedef VOID STDCALL
 (*PDEVICE_CHANGE_COMPLETE_CALLBACK)(
   IN PVOID Context);