Use __int64 instead of 'long long' in LONG_MULT if appropriate

* include/private/gc_pmark.h [!I386 || !__GNUC__ || NACL] (ULONG_MULT_T):
Define new private macro (to unsigned __int64 or unsigned long long).
* include/private/gc_pmark.h [!I386 || !__GNUC__ || NACL] (LONG_MULT):
Use ULONG_MULT_T instead of unsigned long long.

diff --git a/include/private/gc_pmark.h b/include/private/gc_pmark.h
index 1d48fe3..1511763 100644 (file)
--- a/include/private/gc_pmark.h
+++ b/include/private/gc_pmark.h
@@ -210,10 +210,14 @@ GC_INNER mse * GC_signal_mark_stack_overflow(mse *msp);
                              : "g"(y), "0"(x)); \
     } while (0)
 #else
+# if defined(__int64) && !defined(__GNUC__) && !defined(CPPCHECK)
+#   define ULONG_MULT_T unsigned __int64
+# else
+#   define ULONG_MULT_T unsigned long long
+# endif
 # define LONG_MULT(hprod, lprod, x, y) \
     do { \
-        unsigned long long prod = (unsigned long long)(x) \
-                                  * (unsigned long long)(y); \
+        ULONG_MULT_T prod = (ULONG_MULT_T)(x) * (ULONG_MULT_T)(y); \
         GC_STATIC_ASSERT(sizeof(x) + sizeof(y) <= sizeof(prod)); \
         hprod = prod >> 32; \
         lprod = (unsigned32)prod; \