[DXSDK]

- Define STATIC_KSMETHODSETID_BdaChangeSync without braces.
[PSDK]
- _ANONYMOUS_UNION/_ANONYMOUS_STRUCT -> __MINGW_EXTENSION
- usbuser.h : Add missing #endif

svn path=/trunk/; revision=48361

diff --git a/reactos/include/dxsdk/bdamedia.h b/reactos/include/dxsdk/bdamedia.h
index b9c6760..3c563ca 100644 (file)
--- a/reactos/include/dxsdk/bdamedia.h
+++ b/reactos/include/dxsdk/bdamedia.h
@@ -217,7 +217,7 @@ typedef enum {
 */
 
 #define STATIC_KSMETHODSETID_BdaChangeSync \
-  0xfd0a5af3, 0xb41d, 0x11d2, {0x9c, 0x95, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}
+  0xfd0a5af3, 0xb41d, 0x11d2, 0x9c, 0x95, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0
 
 DEFINE_GUIDSTRUCT("FD0A5AF3-B41D-11d2-9C95-00C04F7971E0", KSMETHODSETID_BdaChangeSync);
 

diff --git a/reactos/include/psdk/ntddmou.h b/reactos/include/psdk/ntddmou.h
index 5228514..fff16af 100644 (file)
--- a/reactos/include/psdk/ntddmou.h
+++ b/reactos/include/psdk/ntddmou.h
@@ -76,9 +76,9 @@ DEFINE_GUID(GUID_DEVINTERFACE_MOUSE, \
 typedef struct _MOUSE_INPUT_DATA {
   USHORT UnitId;
   USHORT Flags;
-  _ANONYMOUS_UNION union {
+  __MINGW_EXTENSION union {
     ULONG Buttons;
-    _ANONYMOUS_STRUCT struct {
+    __MINGW_EXTENSION struct {
       USHORT ButtonFlags;
       USHORT ButtonData;
     } DUMMYSTRUCTNAME;

diff --git a/reactos/include/psdk/ntddstor.h b/reactos/include/psdk/ntddstor.h
index a390633..6b74133 100644 (file)
--- a/reactos/include/psdk/ntddstor.h
+++ b/reactos/include/psdk/ntddstor.h
@@ -628,7 +628,7 @@ typedef struct _STORAGE_MEDIA_SERIAL_NUMBER_DATA {
 typedef struct _PERSISTENT_RESERVE_COMMAND {
   ULONG Version;
   ULONG Size;
-  _ANONYMOUS_UNION union {
+  __MINGW_EXTENSION union {
     struct {
       UCHAR ServiceAction:5;
       UCHAR Reserved1:3;

diff --git a/reactos/include/psdk/usbuser.h b/reactos/include/psdk/usbuser.h
index 188d948..fe95d64 100644 (file)
--- a/reactos/include/psdk/usbuser.h
+++ b/reactos/include/psdk/usbuser.h
@@ -342,6 +342,8 @@ typedef struct _USBUSER_REFRESH_HCT_REG {
 
 #include <poppack.h>
 
+#endif /* _WIN32_WINNT >= 0x0501 */
+
 #ifdef __cplusplus
 }
 #endif