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-26 10:53:26 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-26 10:53:26 +0000
commit8939b46c28247a9c7e2f349020f61ea7038e16ee (patch)
tree8ed6ccd597fddd797541111d8e585eeed3a107ba /base/format_macros.h
parenteb5eaec3e3e50d0effcfb53f629e0c93c0fa119c (diff)
downloadchromium_src-8939b46c28247a9c7e2f349020f61ea7038e16ee.zip
chromium_src-8939b46c28247a9c7e2f349020f61ea7038e16ee.tar.gz
chromium_src-8939b46c28247a9c7e2f349020f61ea7038e16ee.tar.bz2
Revert 27324 - First step towards NaClChrome integration:1. NaCl plugin becomes a builtin 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 "internalnacl" is required to enable the builtin 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
Review URL: http://codereview.chromium.org/153002 TBR=bradnelson@google.com Review URL: http://codereview.chromium.org/244017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/format_macros.h')
-rw-r--r--base/format_macros.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/base/format_macros.h b/base/format_macros.h
index 383579f..4b713ef 100644
--- a/base/format_macros.h
+++ b/base/format_macros.h
@@ -37,17 +37,9 @@
#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"