From 3e1ee5b8b76b68a60f604733d70ef35dc069e28e Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Thu, 10 Nov 2011 01:44:04 +0100
Subject: [PATCH] include: Make "long" numeric constants LP64/LLP64 proof
 (shlwapi.h).

---
 dlls/shlwapi/string.c | 4 ++--
 include/shlwapi.h     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index 95785651ee5..45b8d212384 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -867,7 +867,7 @@ BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet)
   }
   if (dwFlags > STIF_SUPPORT_HEX)
   {
-    WARN("Unknown flags (%08lX)!\n", dwFlags & ~STIF_SUPPORT_HEX);
+    WARN("Unknown flags (%08X)!\n", dwFlags & ~STIF_SUPPORT_HEX);
   }
 
   /* Skip leading space, '+', '-' */
@@ -937,7 +937,7 @@ BOOL WINAPI StrToIntExW(LPCWSTR lpszStr, DWORD dwFlags, LPINT lpiRet)
   }
   if (dwFlags > STIF_SUPPORT_HEX)
   {
-    WARN("Unknown flags (%08lX)!\n", dwFlags & ~STIF_SUPPORT_HEX);
+    WARN("Unknown flags (%08X)!\n", dwFlags & ~STIF_SUPPORT_HEX);
   }
 
   /* Skip leading space, '+', '-' */
diff --git a/include/shlwapi.h b/include/shlwapi.h
index bec8b3a4f2f..2ebcdc9bae7 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -747,8 +747,8 @@ HRESULT WINAPI ParseURLW(LPCWSTR pszUrl, PARSEDURLW *ppu);
 #ifndef NO_SHLWAPI_STRFCNS
 
 /* StrToIntEx flags */
-#define STIF_DEFAULT     0x0L
-#define STIF_SUPPORT_HEX 0x1L
+#define STIF_DEFAULT     __MSABI_LONG(0x0)
+#define STIF_SUPPORT_HEX __MSABI_LONG(0x1)
 
 BOOL WINAPI ChrCmpIA (WORD,WORD);
 BOOL WINAPI ChrCmpIW (WCHAR,WCHAR);