diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 17:20:07 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 17:20:07 +0000 |
| commit | fa1c33787f900c15b17b31b261f1883f8348355c (patch) | |
| tree | 97528138c6e514c53e56b09d25b50ef2b0a13226 /base/format_macros.h | |
| parent | 78c0468be50cd9747519b05ebcc4f46a8dacde76 (diff) | |
| download | chromium_src-fa1c33787f900c15b17b31b261f1883f8348355c.zip chromium_src-fa1c33787f900c15b17b31b261f1883f8348355c.tar.gz chromium_src-fa1c33787f900c15b17b31b261f1883f8348355c.tar.bz2 | |
Prevent macro redefinition
Review URL: http://codereview.chromium.org/657016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/format_macros.h')
| -rw-r--r-- | base/format_macros.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base/format_macros.h b/base/format_macros.h index d218f48..9c9b950 100644 --- a/base/format_macros.h +++ b/base/format_macros.h @@ -42,7 +42,9 @@ #define WidePRIu64 PRIu64 #define WidePRIx64 PRIx64 +#if !defined(PRIuS) #define PRIuS "zu" +#endif #else // OS_WIN @@ -62,7 +64,9 @@ #define WidePRIu64 L"I64u" #define WidePRIx64 L"I64x" +#if !defined(PRIuS) #define PRIuS "Iu" +#endif #endif |