| Index: src/globals.h
|
| diff --git a/src/globals.h b/src/globals.h
|
| index 6bb73cd746cae23c627393240b9089db4180deaa..d0a57a4039f4d59ff0194f0cb4c537b635e7a9db 100644
|
| --- a/src/globals.h
|
| +++ b/src/globals.h
|
| @@ -171,27 +171,32 @@ typedef byte* Address;
|
| // Define our own macros for writing 64-bit constants. This is less fragile
|
| // than defining __STDC_CONSTANT_MACROS before including <stdint.h>, and it
|
| // works on compilers that don't have it (like MSVC).
|
| -#if V8_HOST_ARCH_64_BIT
|
| -#if defined(_MSC_VER)
|
| -#define V8_UINT64_C(x) (x ## UI64)
|
| -#define V8_INT64_C(x) (x ## I64)
|
| -#define V8_INTPTR_C(x) (x ## I64)
|
| -#define V8_PTR_PREFIX "ll"
|
| -#elif defined(__MINGW64__)
|
| -#define V8_UINT64_C(x) (x ## ULL)
|
| -#define V8_INT64_C(x) (x ## LL)
|
| -#define V8_INTPTR_C(x) (x ## LL)
|
| -#define V8_PTR_PREFIX "I64"
|
| +#if V8_CC_MSVC
|
| +# define V8_UINT64_C(x) (x ## UI64)
|
| +# define V8_INT64_C(x) (x ## I64)
|
| +# if V8_HOST_ARCH_64_BIT
|
| +# define V8_INTPTR_C(x) (x ## I64)
|
| +# define V8_PTR_PREFIX "ll"
|
| +# else
|
| +# define V8_INTPTR_C(x) (x)
|
| +# define V8_PTR_PREFIX ""
|
| +# endif // V8_HOST_ARCH_64_BIT
|
| +#elif V8_CC_MINGW64
|
| +# define V8_UINT64_C(x) (x ## ULL)
|
| +# define V8_INT64_C(x) (x ## LL)
|
| +# define V8_INTPTR_C(x) (x ## LL)
|
| +# define V8_PTR_PREFIX "I64"
|
| +#elif V8_HOST_ARCH_64_BIT
|
| +# define V8_UINT64_C(x) (x ## UL)
|
| +# define V8_INT64_C(x) (x ## L)
|
| +# define V8_INTPTR_C(x) (x ## L)
|
| +# define V8_PTR_PREFIX "l"
|
| #else
|
| -#define V8_UINT64_C(x) (x ## UL)
|
| -#define V8_INT64_C(x) (x ## L)
|
| -#define V8_INTPTR_C(x) (x ## L)
|
| -#define V8_PTR_PREFIX "l"
|
| +# define V8_UINT64_C(x) (x ## ULL)
|
| +# define V8_INT64_C(x) (x ## LL)
|
| +# define V8_INTPTR_C(x) (x)
|
| +# define V8_PTR_PREFIX ""
|
| #endif
|
| -#else // V8_HOST_ARCH_64_BIT
|
| -#define V8_INTPTR_C(x) (x)
|
| -#define V8_PTR_PREFIX ""
|
| -#endif // V8_HOST_ARCH_64_BIT
|
|
|
| // The following macro works on both 32 and 64-bit platforms.
|
| // Usage: instead of writing 0x1234567890123456
|
|
|