summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 04:33:00 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 04:33:00 +0000
commit4ec69c236ce16608d116df2850c0084d0ecd31c5 (patch)
treefcad189db929a9cdb06c02f130b63cb622fcb31a /base
parent944acb3c4374e07d1bda2e8b0268a34e7764475c (diff)
downloadchromium_src-4ec69c236ce16608d116df2850c0084d0ecd31c5.zip
chromium_src-4ec69c236ce16608d116df2850c0084d0ecd31c5.tar.gz
chromium_src-4ec69c236ce16608d116df2850c0084d0ecd31c5.tar.bz2
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
Diffstat (limited to 'base')
-rw-r--r--base/basictypes.h4
1 files changed, 2 insertions, 2 deletions
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
// <inttypes.h> 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;