Changed GUID_DEFINED to _GUID_DEFINED for compatibility (prevent conflict) with mingw...
[reactos.git] / reactos / include / net / ndis.h
index 090d5cd..a018457 100644 (file)
@@ -96,15 +96,6 @@ typedef struct _DMA_CONFIGURATION_BYTE1
 } DMA_CONFIGURATION_BYTE1;
 
 
-typedef struct _CM_MCA_POS_DATA
-{
-    USHORT  AdapterId;
-    UCHAR   PosData1;
-    UCHAR   PosData2;
-    UCHAR   PosData3;
-    UCHAR   PosData4;
-} CM_MCA_POS_DATA, *PCM_MCA_POS_DATA;
-
 typedef struct _EISA_MEMORY_TYPE
 {
     UCHAR   ReadWrite:1;
@@ -206,8 +197,8 @@ typedef CONST CHAR *PCSTR;
 
 #if defined(NDIS_MINIPORT_DRIVER) || !defined(_MSC_VER)
 
-#ifndef GUID_DEFINED
-#define GUID_DEFINED
+#ifndef _GUID_DEFINED
+#define _GUID_DEFINED
 
 typedef struct _GUID {
     ULONG   Data1;
@@ -216,7 +207,7 @@ typedef struct _GUID {
     UCHAR   Data4[8];
 } GUID;
 
-#endif /* GUID_DEFINED */
+#endif /* _GUID_DEFINED */
 
 #endif /* NDIS_MINIPORT_DRIVER || _MSC_VER */