* Throughout, use __MSABI_LONG macro rather than 'L' qualifier
	for unsigned numerical constants as well.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5283 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index fb309af..e661b91 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,5 +1,10 @@
 2012-07-30  Corinna Vinschen  <vinschen@redhat.com>
 
+	* Throughout, use __MSABI_LONG macro rather than 'L' qualifier
+	for unsigned numerical constants as well.
+
+2012-07-30  Corinna Vinschen  <vinschen@redhat.com>
+
 	* winnt.h: In case of Cygwin, include gcc-provided intrinsic
 	files directly, instead of including intrin.h.
 
diff --git a/mingw-w64-headers/include/avifmt.h b/mingw-w64-headers/include/avifmt.h
index 085a43d..9d9d550 100644
--- a/mingw-w64-headers/include/avifmt.h
+++ b/mingw-w64-headers/include/avifmt.h
@@ -36,7 +36,7 @@
 
 #define ckidAVINEWINDEX mmioFOURCC('i','d','x','1')
 
-#define streamtypeANY 0UL
+#define streamtypeANY __MSABI_LONG(0U)
 #define streamtypeVIDEO mmioFOURCC('v','i','d','s')
 #define streamtypeAUDIO mmioFOURCC('a','u','d','s')
 #define streamtypeMIDI mmioFOURCC('m','i','d','s')
diff --git a/mingw-w64-headers/include/basetsd.h b/mingw-w64-headers/include/basetsd.h
index b04561f..dbf15a0 100644
--- a/mingw-w64-headers/include/basetsd.h
+++ b/mingw-w64-headers/include/basetsd.h
@@ -94,7 +94,7 @@
 
 #else
 
-#define ADDRESS_TAG_BIT 0x80000000UL
+#define ADDRESS_TAG_BIT __MSABI_LONG(0x80000000U)
 
   typedef unsigned short UHALF_PTR,*PUHALF_PTR;
   typedef short HALF_PTR,*PHALF_PTR;
diff --git a/mingw-w64-headers/include/directx/d3d9types.h b/mingw-w64-headers/include/directx/d3d9types.h
index 2bc21ad..f707eb1 100644
--- a/mingw-w64-headers/include/directx/d3d9types.h
+++ b/mingw-w64-headers/include/directx/d3d9types.h
@@ -132,7 +132,7 @@
 #define D3DVS_W_W	(3 << (D3DVS_SWIZZLE_SHIFT + 6))
 #define D3DVS_NOSWIZZLE	(D3DVS_X_X|D3DVS_Y_Y|D3DVS_Z_Z|D3DVS_W_W)
 #define D3DPRESENT_RATE_DEFAULT	0
-#define D3DRENDERSTATE_WRAPBIAS	128UL
+#define D3DRENDERSTATE_WRAPBIAS	__MSABI_LONG(128U)
 #define D3DSHADER_ADDRESSMODE_SHIFT	13
 #define D3DSHADER_ADDRESSMODE_MASK	(1 << D3DSHADER_ADDRESSMODE_SHIFT)
 #define D3DSHADER_COMPARISON_SHIFT	D3DSP_OPCODESPECIFICCONTROL_SHIFT
diff --git a/mingw-w64-headers/include/ndrtypes.h b/mingw-w64-headers/include/ndrtypes.h
index e71eb79..988a60e 100644
--- a/mingw-w64-headers/include/ndrtypes.h
+++ b/mingw-w64-headers/include/ndrtypes.h
@@ -22,16 +22,16 @@
 
 #define SIZEOF_INT3264() ((pCommand->Is64BitEnv()) ? 8 : 4)
 
-#define NDR_MAJOR_VERSION 5UL
-#define NDR_MINOR_VERSION 4UL
+#define NDR_MAJOR_VERSION __MSABI_LONG(5U)
+#define NDR_MINOR_VERSION __MSABI_LONG(4U)
 #define NDR_VERSION ((NDR_MAJOR_VERSION << 16) | NDR_MINOR_VERSION)
 
-#define NDR_VERSION_1_1 ((1UL << 16) | 1)
-#define NDR_VERSION_2_0 ((2UL << 16) | 0)
-#define NDR_VERSION_5_0 ((5UL << 16) | 0)
-#define NDR_VERSION_5_2 ((5UL << 16) | 2)
-#define NDR_VERSION_5_3 ((5UL << 16) | 3)
-#define NDR_VERSION_5_4 ((5UL << 16) | 4)
+#define NDR_VERSION_1_1 ((__MSABI_LONG(1U) << 16) | 1)
+#define NDR_VERSION_2_0 ((__MSABI_LONG(2U) << 16) | 0)
+#define NDR_VERSION_5_0 ((__MSABI_LONG(5U) << 16) | 0)
+#define NDR_VERSION_5_2 ((__MSABI_LONG(5U) << 16) | 2)
+#define NDR_VERSION_5_3 ((__MSABI_LONG(5U) << 16) | 3)
+#define NDR_VERSION_5_4 ((__MSABI_LONG(5U) << 16) | 4)
 
 #define LOAD_TLB_AS_64BIT 0
 #define LOAD_TLB_AS_32BIT 0
diff --git a/mingw-w64-headers/include/rpcdcep.h b/mingw-w64-headers/include/rpcdcep.h
index 155ab06..203075e 100644
--- a/mingw-w64-headers/include/rpcdcep.h
+++ b/mingw-w64-headers/include/rpcdcep.h
@@ -46,10 +46,10 @@
 
 #define RPC_CONTEXT_HANDLE_DEFAULT_GUARD ((void *) -4083)
 
-#define RPC_CONTEXT_HANDLE_DEFAULT_FLAGS 0x00000000UL
-#define RPC_CONTEXT_HANDLE_FLAGS 0x30000000UL
-#define RPC_CONTEXT_HANDLE_SERIALIZE 0x10000000UL
-#define RPC_CONTEXT_HANDLE_DONT_SERIALIZE 0x20000000UL
+#define RPC_CONTEXT_HANDLE_DEFAULT_FLAGS __MSABI_LONG(0x00000000U)
+#define RPC_CONTEXT_HANDLE_FLAGS __MSABI_LONG(0x30000000U)
+#define RPC_CONTEXT_HANDLE_SERIALIZE __MSABI_LONG(0x10000000U)
+#define RPC_CONTEXT_HANDLE_DONT_SERIALIZE __MSABI_LONG(0x20000000U)
 
 #define RPC_NCA_FLAGS_DEFAULT 0x00000000
 #define RPC_NCA_FLAGS_IDEMPOTENT 0x00000001
@@ -62,15 +62,15 @@
 #define RPC_BUFFER_ASYNC 0x00008000
 #define RPC_BUFFER_NONOTIFY 0x00010000
 
-#define RPCFLG_MESSAGE 0x01000000UL
-#define RPCFLG_AUTO_COMPLETE 0x08000000UL
-#define RPCFLG_LOCAL_CALL 0x10000000UL
-#define RPCFLG_INPUT_SYNCHRONOUS 0x20000000UL
-#define RPCFLG_ASYNCHRONOUS 0x40000000UL
-#define RPCFLG_NON_NDR 0x80000000UL
+#define RPCFLG_MESSAGE __MSABI_LONG(0x01000000U)
+#define RPCFLG_AUTO_COMPLETE __MSABI_LONG(0x08000000U)
+#define RPCFLG_LOCAL_CALL __MSABI_LONG(0x10000000U)
+#define RPCFLG_INPUT_SYNCHRONOUS __MSABI_LONG(0x20000000U)
+#define RPCFLG_ASYNCHRONOUS __MSABI_LONG(0x40000000U)
+#define RPCFLG_NON_NDR __MSABI_LONG(0x80000000U)
 
-#define RPCFLG_HAS_MULTI_SYNTAXES 0x02000000UL
-#define RPCFLG_HAS_CALLBACK 0x04000000UL
+#define RPCFLG_HAS_MULTI_SYNTAXES __MSABI_LONG(0x02000000U)
+#define RPCFLG_HAS_CALLBACK __MSABI_LONG(0x04000000U)
 
 #define RPC_FLAGS_VALID_BIT 0x00008000
 
diff --git a/mingw-w64-headers/include/sqlext.h b/mingw-w64-headers/include/sqlext.h
index 6dbeccb..419caad 100644
--- a/mingw-w64-headers/include/sqlext.h
+++ b/mingw-w64-headers/include/sqlext.h
@@ -39,17 +39,17 @@
 
 #if (ODBCVER >= 0x0300)
 
-#define SQL_CP_OFF 0UL
-#define SQL_CP_ONE_PER_DRIVER 1UL
-#define SQL_CP_ONE_PER_HENV 2UL
+#define SQL_CP_OFF __MSABI_LONG(0U)
+#define SQL_CP_ONE_PER_DRIVER __MSABI_LONG(1U)
+#define SQL_CP_ONE_PER_HENV __MSABI_LONG(2U)
 #define SQL_CP_DEFAULT SQL_CP_OFF
 
-#define SQL_CP_STRICT_MATCH 0UL
-#define SQL_CP_RELAXED_MATCH 1UL
+#define SQL_CP_STRICT_MATCH __MSABI_LONG(0U)
+#define SQL_CP_RELAXED_MATCH __MSABI_LONG(1U)
 #define SQL_CP_MATCH_DEFAULT SQL_CP_STRICT_MATCH
 
-#define SQL_OV_ODBC2 2UL
-#define SQL_OV_ODBC3 3UL
+#define SQL_OV_ODBC2 __MSABI_LONG(2U)
+#define SQL_OV_ODBC3 __MSABI_LONG(3U)
 #endif
 
 #define SQL_ACCESS_MODE 101
@@ -100,29 +100,29 @@
 #define SQL_CONN_OPT_MIN SQL_ACCESS_MODE
 #endif
 
-#define SQL_MODE_READ_WRITE 0UL
-#define SQL_MODE_READ_ONLY 1UL
+#define SQL_MODE_READ_WRITE __MSABI_LONG(0U)
+#define SQL_MODE_READ_ONLY __MSABI_LONG(1U)
 #define SQL_MODE_DEFAULT SQL_MODE_READ_WRITE
 
-#define SQL_AUTOCOMMIT_OFF 0UL
-#define SQL_AUTOCOMMIT_ON 1UL
+#define SQL_AUTOCOMMIT_OFF __MSABI_LONG(0U)
+#define SQL_AUTOCOMMIT_ON __MSABI_LONG(1U)
 #define SQL_AUTOCOMMIT_DEFAULT SQL_AUTOCOMMIT_ON
 
-#define SQL_LOGIN_TIMEOUT_DEFAULT 15UL
+#define SQL_LOGIN_TIMEOUT_DEFAULT __MSABI_LONG(15U)
 
-#define SQL_OPT_TRACE_OFF 0UL
-#define SQL_OPT_TRACE_ON 1UL
+#define SQL_OPT_TRACE_OFF __MSABI_LONG(0U)
+#define SQL_OPT_TRACE_ON __MSABI_LONG(1U)
 #define SQL_OPT_TRACE_DEFAULT SQL_OPT_TRACE_OFF
 #define SQL_OPT_TRACE_FILE_DEFAULT "\\SQL.LOG"
 
-#define SQL_CUR_USE_IF_NEEDED 0UL
-#define SQL_CUR_USE_ODBC 1UL
-#define SQL_CUR_USE_DRIVER 2UL
+#define SQL_CUR_USE_IF_NEEDED __MSABI_LONG(0U)
+#define SQL_CUR_USE_ODBC __MSABI_LONG(1U)
+#define SQL_CUR_USE_DRIVER __MSABI_LONG(2U)
 #define SQL_CUR_DEFAULT SQL_CUR_USE_DRIVER
 
 #if (ODBCVER >= 0x0300)
-#define SQL_DB_RETURN_TO_POOL 0UL
-#define SQL_DB_DISCONNECT 1UL
+#define SQL_DB_RETURN_TO_POOL __MSABI_LONG(0U)
+#define SQL_DB_DISCONNECT __MSABI_LONG(1U)
 #define SQL_DB_DEFAULT SQL_DB_RETURN_TO_POOL
 
 #define SQL_DTC_DONE __MSABI_LONG(0)
@@ -200,25 +200,25 @@
 #endif
 
 #if (ODBCVER >= 0x0300)
-#define SQL_PARAM_BIND_BY_COLUMN 0UL
+#define SQL_PARAM_BIND_BY_COLUMN __MSABI_LONG(0U)
 #define SQL_PARAM_BIND_TYPE_DEFAULT SQL_PARAM_BIND_BY_COLUMN
 #endif
 
-#define SQL_QUERY_TIMEOUT_DEFAULT 0UL
+#define SQL_QUERY_TIMEOUT_DEFAULT __MSABI_LONG(0U)
 
-#define SQL_MAX_ROWS_DEFAULT 0UL
+#define SQL_MAX_ROWS_DEFAULT __MSABI_LONG(0U)
 
-#define SQL_NOSCAN_OFF 0UL
-#define SQL_NOSCAN_ON 1UL
+#define SQL_NOSCAN_OFF __MSABI_LONG(0U)
+#define SQL_NOSCAN_ON __MSABI_LONG(1U)
 #define SQL_NOSCAN_DEFAULT SQL_NOSCAN_OFF
 
-#define SQL_MAX_LENGTH_DEFAULT 0UL
+#define SQL_MAX_LENGTH_DEFAULT __MSABI_LONG(0U)
 
-#define SQL_ASYNC_ENABLE_OFF 0UL
-#define SQL_ASYNC_ENABLE_ON 1UL
+#define SQL_ASYNC_ENABLE_OFF __MSABI_LONG(0U)
+#define SQL_ASYNC_ENABLE_ON __MSABI_LONG(1U)
 #define SQL_ASYNC_ENABLE_DEFAULT SQL_ASYNC_ENABLE_OFF
 
-#define SQL_BIND_BY_COLUMN 0UL
+#define SQL_BIND_BY_COLUMN __MSABI_LONG(0U)
 #define SQL_BIND_TYPE_DEFAULT SQL_BIND_BY_COLUMN
 
 #define SQL_CONCUR_READ_ONLY 1
@@ -227,31 +227,31 @@
 #define SQL_CONCUR_VALUES 4
 #define SQL_CONCUR_DEFAULT SQL_CONCUR_READ_ONLY
 
-#define SQL_CURSOR_FORWARD_ONLY 0UL
-#define SQL_CURSOR_KEYSET_DRIVEN 1UL
-#define SQL_CURSOR_DYNAMIC 2UL
-#define SQL_CURSOR_STATIC 3UL
+#define SQL_CURSOR_FORWARD_ONLY __MSABI_LONG(0U)
+#define SQL_CURSOR_KEYSET_DRIVEN __MSABI_LONG(1U)
+#define SQL_CURSOR_DYNAMIC __MSABI_LONG(2U)
+#define SQL_CURSOR_STATIC __MSABI_LONG(3U)
 #define SQL_CURSOR_TYPE_DEFAULT SQL_CURSOR_FORWARD_ONLY
 
-#define SQL_ROWSET_SIZE_DEFAULT 1UL
+#define SQL_ROWSET_SIZE_DEFAULT __MSABI_LONG(1U)
 
-#define SQL_KEYSET_SIZE_DEFAULT 0UL
+#define SQL_KEYSET_SIZE_DEFAULT __MSABI_LONG(0U)
 
-#define SQL_SC_NON_UNIQUE 0UL
-#define SQL_SC_TRY_UNIQUE 1UL
-#define SQL_SC_UNIQUE 2UL
+#define SQL_SC_NON_UNIQUE __MSABI_LONG(0U)
+#define SQL_SC_TRY_UNIQUE __MSABI_LONG(1U)
+#define SQL_SC_UNIQUE __MSABI_LONG(2U)
 
-#define SQL_RD_OFF 0UL
-#define SQL_RD_ON 1UL
+#define SQL_RD_OFF __MSABI_LONG(0U)
+#define SQL_RD_ON __MSABI_LONG(1U)
 #define SQL_RD_DEFAULT SQL_RD_ON
 
-#define SQL_UB_OFF 0UL
-#define SQL_UB_ON 01UL
+#define SQL_UB_OFF __MSABI_LONG(0U)
+#define SQL_UB_ON __MSABI_LONG(01U)
 #define SQL_UB_DEFAULT SQL_UB_OFF
 
 #if (ODBCVER >= 0x0300)
 #define SQL_UB_FIXED SQL_UB_ON
-#define SQL_UB_VARIABLE 2UL
+#define SQL_UB_VARIABLE __MSABI_LONG(2U)
 #endif
 
 #if (ODBCVER >= 0x0300)
@@ -1217,9 +1217,9 @@
 #define SQL_IS_INSERT_SEARCHED __MSABI_LONG(0x00000002)
 #define SQL_IS_SELECT_INTO __MSABI_LONG(0x00000004)
 
-#define SQL_OIC_CORE 1UL
-#define SQL_OIC_LEVEL1 2UL
-#define SQL_OIC_LEVEL2 3UL
+#define SQL_OIC_CORE __MSABI_LONG(1U)
+#define SQL_OIC_LEVEL1 __MSABI_LONG(2U)
+#define SQL_OIC_LEVEL2 __MSABI_LONG(3U)
 
 #define SQL_SFKD_CASCADE __MSABI_LONG(0x00000001)
 #define SQL_SFKD_NO_ACTION __MSABI_LONG(0x00000002)
diff --git a/mingw-w64-headers/include/tapi.h b/mingw-w64-headers/include/tapi.h
index 30d6a74..11152f7 100644
--- a/mingw-w64-headers/include/tapi.h
+++ b/mingw-w64-headers/include/tapi.h
@@ -94,7 +94,7 @@
 #define LINE_CALLHUBCLOSE __MSABI_LONG(33)
 #define LINE_DEVSPECIFICEX __MSABI_LONG(34)
 
-#define INITIALIZE_NEGOTIATION 0xFFFFFFFFUL
+#define INITIALIZE_NEGOTIATION __MSABI_LONG(0xFFFFFFFFU)
 
 #define LINEADDRCAPFLAGS_FWDNUMRINGS 0x00000001
 #define LINEADDRCAPFLAGS_PICKUPGROUPID 0x00000002
diff --git a/mingw-w64-headers/include/uxtheme.h b/mingw-w64-headers/include/uxtheme.h
index f57e547..b1625e0 100644
--- a/mingw-w64-headers/include/uxtheme.h
+++ b/mingw-w64-headers/include/uxtheme.h
@@ -122,20 +122,20 @@
 
 #if (_WIN32_WINNT >= 0x0600)
 
-#define DTT_TEXTCOLOR (1UL << 0)
-#define DTT_BORDERCOLOR (1UL << 1)
-#define DTT_SHADOWCOLOR (1UL << 2)
-#define DTT_SHADOWTYPE (1UL << 3)
-#define DTT_SHADOWOFFSET (1UL << 4)
-#define DTT_BORDERSIZE (1UL << 5)
-#define DTT_FONTPROP (1UL << 6)
-#define DTT_COLORPROP (1UL << 7)
-#define DTT_STATEID (1UL << 8)
-#define DTT_CALCRECT (1UL << 9)
-#define DTT_APPLYOVERLAY (1UL << 10)
-#define DTT_GLOWSIZE (1UL << 11)
-#define DTT_CALLBACK (1UL << 12)
-#define DTT_COMPOSITED (1UL << 13)
+#define DTT_TEXTCOLOR (__MSABI_LONG(1U) << 0)
+#define DTT_BORDERCOLOR (__MSABI_LONG(1U) << 1)
+#define DTT_SHADOWCOLOR (__MSABI_LONG(1U) << 2)
+#define DTT_SHADOWTYPE (__MSABI_LONG(1U) << 3)
+#define DTT_SHADOWOFFSET (__MSABI_LONG(1U) << 4)
+#define DTT_BORDERSIZE (__MSABI_LONG(1U) << 5)
+#define DTT_FONTPROP (__MSABI_LONG(1U) << 6)
+#define DTT_COLORPROP (__MSABI_LONG(1U) << 7)
+#define DTT_STATEID (__MSABI_LONG(1U) << 8)
+#define DTT_CALCRECT (__MSABI_LONG(1U) << 9)
+#define DTT_APPLYOVERLAY (__MSABI_LONG(1U) << 10)
+#define DTT_GLOWSIZE (__MSABI_LONG(1U) << 11)
+#define DTT_CALLBACK (__MSABI_LONG(1U) << 12)
+#define DTT_COMPOSITED (__MSABI_LONG(1U) << 13)
 #define DTT_VALIDBITS (DTT_TEXTCOLOR | DTT_BORDERCOLOR | DTT_SHADOWCOLOR | DTT_SHADOWTYPE | DTT_SHADOWOFFSET | DTT_BORDERSIZE | \
                        DTT_FONTPROP | DTT_COLORPROP | DTT_STATEID | DTT_CALCRECT | DTT_APPLYOVERLAY | DTT_GLOWSIZE | DTT_COMPOSITED)
 
diff --git a/mingw-w64-headers/include/vfw.h b/mingw-w64-headers/include/vfw.h
index 05c6d76..83aa50d 100644
--- a/mingw-w64-headers/include/vfw.h
+++ b/mingw-w64-headers/include/vfw.h
@@ -655,7 +655,7 @@
 
 #define ckidAVINEWINDEX mmioFOURCC('i','d','x','1')
 
-#define streamtypeANY 0UL
+#define streamtypeANY __MSABI_LONG(0U)
 #define streamtypeVIDEO mmioFOURCC('v','i','d','s')
 #define streamtypeAUDIO mmioFOURCC('a','u','d','s')
 #define streamtypeMIDI mmioFOURCC('m','i','d','s')
@@ -766,7 +766,7 @@
 #endif
 
 #ifndef streamtypeVIDEO
-#define streamtypeANY 0UL
+#define streamtypeANY __MSABI_LONG(0U)
 #define streamtypeVIDEO mmioFOURCC('v','i','d','s')
 #define streamtypeAUDIO mmioFOURCC('a','u','d','s')
 #define streamtypeMIDI mmioFOURCC('m','i','d','s')
diff --git a/mingw-w64-headers/include/wdspxe.h b/mingw-w64-headers/include/wdspxe.h
index 71028bd..0ad9702 100644
--- a/mingw-w64-headers/include/wdspxe.h
+++ b/mingw-w64-headers/include/wdspxe.h
@@ -95,8 +95,8 @@
 DWORD PXEAPI PxeProviderQueryIndex(LPCWSTR pszProviderName,PULONG puIndex);
 DWORD PXEAPI PxeProviderRecvRequest(HANDLE hClientRequest,PVOID pPacket,ULONG uPacketLen,PXE_ADDRESS *pLocalAddress,PXE_ADDRESS *pRemoteAddress,PXE_BOOT_ACTION pAction,PVOID pContext);
 
-#define PXE_REG_INDEX_TOP	0UL
-#define PXE_REG_INDEX_BOTTOM	0xFFFFFFFFUL
+#define PXE_REG_INDEX_TOP	__MSABI_LONG(0U)
+#define PXE_REG_INDEX_BOTTOM	__MSABI_LONG(0xFFFFFFFFU)
 
 DWORD PXEAPI PxeProviderRegister(LPCWSTR pszProviderName,LPCWSTR pszModulePath,PXE_REG_INDEX Index,WINBOOL bIsCritical,PHKEY phProviderKey);
 DWORD PXEAPI PxeProviderServiceControl(PVOID pContext,DWORD dwControl);
diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h
index 008b02d..7de5b15 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h
@@ -2814,8 +2814,8 @@
 
 /*One-Time Initialization http://msdn.microsoft.com/en-us/library/aa363808(VS.85).aspx*/
 /* FIXME: See above !!! */
-#define INIT_ONCE_ASYNC 0x00000002UL
-#define INIT_ONCE_INIT_FAILED 0x00000004UL
+#define INIT_ONCE_ASYNC __MSABI_LONG(0x00000002U)
+#define INIT_ONCE_INIT_FAILED __MSABI_LONG(0x00000004U)
 
 typedef PRTL_RUN_ONCE PINIT_ONCE;
 typedef PRTL_RUN_ONCE LPINIT_ONCE;
@@ -3758,7 +3758,7 @@
   ULONG Length
 );
 
-#define PROCESS_AFFINITY_ENABLE_AUTO_UPDATE 0x00000001UL
+#define PROCESS_AFFINITY_ENABLE_AUTO_UPDATE __MSABI_LONG(0x00000001U)
 
 WINBASEAPI WINBOOL WINAPI SetProcessAffinityUpdateMode(
   HANDLE ProcessHandle,
diff --git a/mingw-w64-headers/include/wincrypt.h b/mingw-w64-headers/include/wincrypt.h
index f691291..e9af6ab 100644
--- a/mingw-w64-headers/include/wincrypt.h
+++ b/mingw-w64-headers/include/wincrypt.h
@@ -2102,7 +2102,7 @@
 #define CMSG_HASHED 5
 #define CMSG_ENCRYPTED 6
 
-#define CMSG_ALL_FLAGS (~0UL)
+#define CMSG_ALL_FLAGS (~__MSABI_LONG(0U))
 #define CMSG_DATA_FLAG (1 << CMSG_DATA)
 #define CMSG_SIGNED_FLAG (1 << CMSG_SIGNED)
 #define CMSG_ENVELOPED_FLAG (1 << CMSG_ENVELOPED)
@@ -3157,7 +3157,7 @@
 #define CERT_STORE_CERTIFICATE_CONTEXT 1
 #define CERT_STORE_CRL_CONTEXT 2
 #define CERT_STORE_CTL_CONTEXT 3
-#define CERT_STORE_ALL_CONTEXT_FLAG (~0UL)
+#define CERT_STORE_ALL_CONTEXT_FLAG (~__MSABI_LONG(0U))
 #define CERT_STORE_CERTIFICATE_CONTEXT_FLAG (1 << CERT_STORE_CERTIFICATE_CONTEXT)
 #define CERT_STORE_CRL_CONTEXT_FLAG (1 << CERT_STORE_CRL_CONTEXT)
 #define CERT_STORE_CTL_CONTEXT_FLAG (1 << CERT_STORE_CTL_CONTEXT)
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h
index b235928..8a56f2b 100644
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -6462,9 +6462,9 @@
 typedef PVOID RTL_RUN_ONCE, *PRTL_RUN_ONCE;
 typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *);
 #define RTL_RUN_ONCE_INIT 0
-#define RTL_RUN_ONCE_CHECK_ONLY 1UL
-#define RTL_RUN_ONCE_ASYNC 2UL
-#define RTL_RUN_ONCE_INIT_FAILED 4UL
+#define RTL_RUN_ONCE_CHECK_ONLY __MSABI_LONG(1U)
+#define RTL_RUN_ONCE_ASYNC __MSABI_LONG(2U)
+#define RTL_RUN_ONCE_INIT_FAILED __MSABI_LONG(4U)
 #define RTL_RUN_ONCE_CTX_RESERVED_BITS 2
 #endif /* _RTL_RUN_ONCE_DEF */
 #define RTL_SRWLOCK_INIT 0