From 4ec69c236ce16608d116df2850c0084d0ecd31c5 Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Thu, 24 Mar 2011 04:33:00 +0000 Subject: Use #if defined(__LP64__) in preference to #if __LP64__. This is a follow-up to r79069. BUG=44127, 18323 TEST=64-bit base should all (mostly) build Review URL: http://codereview.chromium.org/6723016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79252 0039d316-1c4b-4281-b951-d872f2087c98 --- base/basictypes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'base') diff --git a/base/basictypes.h b/base/basictypes.h index 3b1bfba..1188d8d 100644 --- a/base/basictypes.h +++ b/base/basictypes.h @@ -32,7 +32,7 @@ typedef int int32; // // On Mac OS X, |long long| is used for 64-bit types for compatibility with // format macros even in the LP64 model. -#if __LP64__ && !defined(OS_MACOSX) +#if defined(__LP64__) && !defined(OS_MACOSX) typedef long int64; #else typedef long long int64; @@ -54,7 +54,7 @@ typedef unsigned int uint32; #endif // See the comment above about NSPR and 64-bit. -#if __LP64__ && !defined(OS_MACOSX) +#if defined(__LP64__) && !defined(OS_MACOSX) typedef unsigned long uint64; #else typedef unsigned long long uint64; -- cgit v1.1