Sync with trunk (r48414)

[reactos.git] / include / psdk / ntddstor.h

diff --git a/include/psdk/ntddstor.h b/include/psdk/ntddstor.h
index 5fb0b3b..6b74133 100644 (file)
--- a/include/psdk/ntddstor.h
+++ b/include/psdk/ntddstor.h
@@ -80,7 +80,7 @@ DEFINE_GUID(GUID_DEVINTERFACE_HIDDEN_VOLUME,
 
 #endif /* defined(DEFINE_GUID) */
 
-#ifndef _WINIOCTL_H
+#ifndef _WINIOCTL_
 
 #define IOCTL_STORAGE_BASE                FILE_DEVICE_MASS_STORAGE
 
@@ -135,7 +135,7 @@ DEFINE_GUID(GUID_DEVINTERFACE_HIDDEN_VOLUME,
 #define IOCTL_STORAGE_PREDICT_FAILURE \
   CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
-#endif /* _WINIOCTL_H */
+#endif /* _WINIOCTL_ */
 
 #define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER \
   CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS)
@@ -246,7 +246,7 @@ typedef struct _STORAGE_BREAK_RESERVATION_REQUEST {
   UCHAR Lun;
 } STORAGE_BREAK_RESERVATION_REQUEST, *PSTORAGE_BREAK_RESERVATION_REQUEST;
 
-#ifndef _WINIOCTL_H
+#ifndef _WINIOCTL_
 typedef struct _PREVENT_MEDIA_REMOVAL {
   BOOLEAN PreventMediaRemoval;
 } PREVENT_MEDIA_REMOVAL, *PPREVENT_MEDIA_REMOVAL;
@@ -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;