Hi,
the below patch fixes two definition collision between ntdef.h and winnt.h
Ok to apply?
Thanks,
Corinna
* ntdef.h (struct _PROCESSOR_NUMBER): Guard definition with
___PROCESSOR_NUMBER_DEFINED.
(struct _GROUP_AFFINITY): Guard definition with
___GROUP_AFFINITY_DEFINED.
* winnt.h: Ditto.
Index: winnt.h
===================================================================
--- winnt.h (revision 5170)
+++ winnt.h (working copy)
@@ -6604,11 +6604,14 @@
COMPATIBILITY_CONTEXT_ELEMENT Elements[];
} ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION,
*PACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION;
+#ifndef ___PROCESSOR_NUMBER_DEFINED
+#define ___PROCESSOR_NUMBER_DEFINED
typedef struct _PROCESSOR_NUMBER {
WORD Group;
BYTE Number;
BYTE Reserved;
} PROCESSOR_NUMBER, *PPROCESSOR_NUMBER;
+#endif /* !___PROCESSOR_NUMBER_DEFINED */
typedef struct _PROCESSOR_GROUP_INFO {
BYTE MaximumProcessorCount;
@@ -6624,11 +6627,14 @@
PROCESSOR_GROUP_INFO GroupInfo[];
} GROUP_RELATIONSHIP, *PGROUP_RELATIONSHIP;
+#ifndef ___GROUP_AFFINITY_DEFINED
+#define ___GROUP_AFFINITY_DEFINED
typedef struct _GROUP_AFFINITY {
KAFFINITY Mask;
WORD Group;
WORD Reserved[3];
} GROUP_AFFINITY, *PGROUP_AFFINITY;
+#endif /* !___GROUP_AFFINITY_DEFINED */
typedef struct _CACHE_RELATIONSHIP {
BYTE Level;
Index: ntdef.h
===================================================================
--- ntdef.h (revision 5167)
+++ ntdef.h (working copy)
@@ -588,11 +588,14 @@
#endif /* _LIST_ENTRY_DEFINED */
+#ifndef ___PROCESSOR_NUMBER_DEFINED
+#define ___PROCESSOR_NUMBER_DEFINED
typedef struct _PROCESSOR_NUMBER {
USHORT Group;
UCHAR Number;
UCHAR Reserved;
} PROCESSOR_NUMBER, *PPROCESSOR_NUMBER;
+#endif /* !___PROCESSOR_NUMBER_DEFINED */
struct _CONTEXT;
struct _EXCEPTION_RECORD;
@@ -607,11 +610,14 @@
PVOID DispatcherContext);
#endif /* __PEXCEPTION_ROUTINE_DEFINED */
+#ifndef ___GROUP_AFFINITY_DEFINED
+#define ___GROUP_AFFINITY_DEFINED
typedef struct _GROUP_AFFINITY {
KAFFINITY Mask;
USHORT Group;
USHORT Reserved[3];
} GROUP_AFFINITY, *PGROUP_AFFINITY;
+#endif /* !___GROUP_AFFINITY_DEFINED */
/* Helper Macros */
#define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s }
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
