- Fix build break on Mac OS X by using the proper formatting for pointers....

src/globals.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 59 matching lines @@
 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
 #ifdef _MSC_VER
 #define V8_UINT64_C(x)  (x ## UI64)
 #define V8_INT64_C(x)   (x ## I64)
 #define V8_PTR_PREFIX "ll"
-#else
+#else  // _MSC_VER
 #define V8_UINT64_C(x)  (x ## UL)
 #define V8_INT64_C(x)   (x ## L)
 #define V8_PTR_PREFIX "l"
-#endif
+#endif  // _MSC_VER
 #else  // V8_HOST_ARCH_64_BIT
 #define V8_PTR_PREFIX ""
-#endif
+#endif  // V8_HOST_ARCH_64_BIT
 
 #define V8PRIxPTR V8_PTR_PREFIX "x"
 #define V8PRIdPTR V8_PTR_PREFIX "d"
+  
+// Fix for Mac OS X defining uintptr_t as "unsigned long":

[Dean McNamee, 2009/05/13 16:40:59]

I would probably structure this as an if/else with the defines above (so you
don't have to undef), and I wouldn't say Fix, just say that OS X defines it as
unsigned long.

[iposva, 2009/05/13 16:54:50]

I sort of like your offline suggestion better about reusing the standard
definitions of PRI[x|d]PTR  from inttypes.h in the definition of V8PRI[x|d]PTR.
Unfortunately we are using V8PRIdPTR to print pointer differences (32-bit type
int) and not pointers (32-bit type long int) which is what PRIdPTR expects on
Mac OS X. So that solution would also need an exception.

I am standing by "Fix" for the description. Also in my opinion it is more
readable this way because it clearly marks it as an exception instead of being
buried in a series of nested #if.

P.S. We should all be happy that intptr_t is not any longer typedef'd to "int*"
as it used to in early versions of Mac OS X...

+#if defined(__APPLE__) && defined(__MACH__)
+#undef V8PRIxPTR
+#undef V8PRIdPTR
+#define V8PRIxPTR "lx"
+#define V8PRIdPTR "ld"
+#endif
 
 // Code-point values in Unicode 4.0 are 21 bits wide.
 typedef uint16_t uc16;
 typedef int32_t uc32;
 
 // -----------------------------------------------------------------------------
 // Constants
 
 const int KB = 1024;
 const int MB = KB * KB;
@@ skipping 434 matching lines @@
 
   Dest dest;
   memcpy(&dest, &source, sizeof(dest));
   return dest;
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_GLOBALS_H_