Hi,

as proposed on IRC, the below patch replaces all usage of unsigned long
in the ddk subdir with ULONG.  Ok to apply?


Thanks,
Corinna


        * include/ddrawint.h (MAKE_HRESULT): Define in terms of ULONG
        instead of unsigned long.
        * include/ddk/scsiwmi.h (struct _GUID): Define Data1 as ULONG.
        * include/ddk/d4iface.h (CHANNEL_HANDLE, *PCHANNEL_HANDLE): Define
        based on ULONG.
        * include/ddk/ntstrsafe.h (DWORD): Ditto.


Index: include/ddrawint.h
===================================================================
--- include/ddrawint.h  (revision 5223)
+++ include/ddrawint.h  (working copy)
@@ -69,7 +69,7 @@
 #endif
 
 #ifndef MAKE_HRESULT // fixme this if statment should not be here, but 
MAKE_HRESULT should be here
-#define MAKE_HRESULT(sev,fac,code) ((HRESULT) (((unsigned long)(sev)<<31) | 
((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
+#define MAKE_HRESULT(sev,fac,code) ((HRESULT) (((ULONG)(sev)<<31) | 
((ULONG)(fac)<<16) | ((ULONG)(code))) )
 #endif
 
 #ifndef FLATPTR_DEFINED
Index: include/ddk/scsiwmi.h
===================================================================
--- include/ddk/scsiwmi.h       (revision 5223)
+++ include/ddk/scsiwmi.h       (working copy)
@@ -47,7 +47,7 @@
 #if ! (defined _GUID_DEFINED || defined GUID_DEFINED)
 #define GUID_DEFINED
 typedef struct _GUID {
-    unsigned long  Data1;
+    ULONG          Data1;
     unsigned short Data2;
     unsigned short Data3;
     unsigned char  Data4[ 8 ];
Index: include/ddk/d4iface.h
===================================================================
--- include/ddk/d4iface.h       (revision 5223)
+++ include/ddk/d4iface.h       (working copy)
@@ -31,7 +31,7 @@
 #define CONFIG_UPLOAD                  14
 #define CONFIG_DOWNLOAD                        15
 
-typedef unsigned long CHANNEL_HANDLE, *PCHANNEL_HANDLE;
+typedef ULONG CHANNEL_HANDLE, *PCHANNEL_HANDLE;
 
 typedef struct _DOT4_ACTIVITY {
   ULONG ulMessage;
Index: include/ddk/ntstrsafe.h
===================================================================
--- include/ddk/ntstrsafe.h     (revision 5223)
+++ include/ddk/ntstrsafe.h     (working copy)
@@ -29,7 +29,7 @@
 //
 // Typedefs
 //
-typedef unsigned long DWORD;
+typedef ULONG DWORD;
 
 /* PRIVATE FUNCTIONS *********************************************************/
 

------------------------------------------------------------------------------
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

Reply via email to