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-28 20:17:30 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-28 20:17:30 +0000
commit6affd92124f01ee0eb2b75af96d4ab5576cbccf2 (patch)
tree776b9ef00bff93792a329c08dd9b222019c5adb9 /base/format_macros.h
parentd957b76ce4f0fa477a18998747b0db4324dc5f74 (diff)
downloadchromium_src-6affd92124f01ee0eb2b75af96d4ab5576cbccf2.zip
chromium_src-6affd92124f01ee0eb2b75af96d4ab5576cbccf2.tar.gz
chromium_src-6affd92124f01ee0eb2b75af96d4ab5576cbccf2.tar.bz2
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. Command line flag "--internal-nacl" is required to enable the built-in NaCl plugin. NaCl still cannot run in Chrome sandbox, the flag automatically disables the sandboxCommitted: http://src.chromium.org/viewvc/chrome?view=rev&revision=27315
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=27324 Review URL: http://codereview.chromium.org/153002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27397 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"