diff --git a/include/verrsrc.h b/include/verrsrc.h
index fa5c26c94fd..e13165a7d2e 100644
--- a/include/verrsrc.h
+++ b/include/verrsrc.h
@@ -22,7 +22,7 @@
 
 /* Macro to deal with LP64 <=> LLP64 differences in numeric constants with 'l' modifier */
 #ifndef __MSABI_LONG
-# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__)
+#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES)
 #  define __MSABI_LONG(x)         x ## l
 # else
 #  define __MSABI_LONG(x)         x
diff --git a/include/winnt.h b/include/winnt.h
index bd64b092369..079858d2f7d 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -604,7 +604,7 @@ typedef DWORD FLONG;
 
 /* Macro to deal with LP64 <=> LLP64 differences in numeric constants with 'l' modifier */
 #ifndef __MSABI_LONG
-# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__)
+#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES)
 #  define __MSABI_LONG(x)         x ## l
 # else
 #  define __MSABI_LONG(x)         x