summaryrefslogtreecommitdiffstats
path: root/base/format_macros.h
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-18 01:46:27 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-18 01:46:27 +0000
commitea5ac0e47d18753dbe971a35cce7f657ba64bae8 (patch)
tree54713ad26e136bbb9b0bf0062229092c537df533 /base/format_macros.h
parenteb4035b0048a7c9e3eeae7e189161f0cfbf3db22 (diff)
downloadchromium_src-ea5ac0e47d18753dbe971a35cce7f657ba64bae8.zip
chromium_src-ea5ac0e47d18753dbe971a35cce7f657ba64bae8.tar.gz
chromium_src-ea5ac0e47d18753dbe971a35cce7f657ba64bae8.tar.bz2
This is a copy of http://codereview.chromium.org/153002/show
First step towards NaCl-Chrome integration:1. NaCl plugin becomes a built-in plugin in Chrome and runs in the renderer process.2. Most of the changes are related to launching the NaCl process (that loads and runs the NaCl module) and establishing the initial communication between that process and the NaCl plugin.3. This CL relies on another CL that contains the changes on the Native Client side: http://codereview.chromium.org/1501904. Command line flag "--internal-nacl" is required to enable the built-in NaCl plugin.5. NaCl still cannot run in Chrome sandbox, so the "--no-sandbox" flag is also required TBR=bradnelson Review URL: http://codereview.chromium.org/207025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/format_macros.h')
-rw-r--r--base/format_macros.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/base/format_macros.h b/base/format_macros.h
index 4b713ef..383579f 100644
--- a/base/format_macros.h
+++ b/base/format_macros.h
@@ -37,9 +37,17 @@
#else // OS_WIN
+#if !defined(PRId64)
#define PRId64 "I64d"
+#endif
+
+#if !defined(PRIu64)
#define PRIu64 "I64u"
+#endif
+
+#if !defined(PRIx64)
#define PRIx64 "I64x"
+#endif
#define WidePRId64 L"I64d"
#define WidePRIu64 L"I64u"