From cb5ba0cfd2aeaa60aedc9762e40d5fb270a697da Mon Sep 17 00:00:00 2001 From: "haitao.feng@intel.com" Date: Tue, 3 Dec 2013 02:49:42 +0000 Subject: [PATCH] Use ULL and LL suffix for uint64_t and int64_t constants on Mac R=verwaest@chromium.org Review URL: https://codereview.chromium.org/96623002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18215 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/globals.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/globals.h b/src/globals.h index db80a7e..2f526a8 100644 --- a/src/globals.h +++ b/src/globals.h @@ -187,8 +187,13 @@ typedef byte* Address; # 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) +# if V8_OS_MACOSX +# define V8_UINT64_C(x) (x ## ULL) +# define V8_INT64_C(x) (x ## LL) +# else +# define V8_UINT64_C(x) (x ## UL) +# define V8_INT64_C(x) (x ## L) +# endif # define V8_INTPTR_C(x) (x ## L) # define V8_PTR_PREFIX "l" #else @@ -208,13 +213,12 @@ typedef byte* Address; #define V8PRIuPTR V8_PTR_PREFIX "u" // Fix for Mac OS X defining uintptr_t as "unsigned long": -#if defined(__APPLE__) && defined(__MACH__) +#if V8_OS_MACOSX #undef V8PRIxPTR #define V8PRIxPTR "lx" #endif -#if (defined(__APPLE__) && defined(__MACH__)) || \ - defined(__FreeBSD__) || defined(__OpenBSD__) +#if V8_OS_MACOSX || defined(__FreeBSD__) || defined(__OpenBSD__) #define USING_BSD_ABI #endif -- 2.7.4