summaryrefslogtreecommitdiffstats
path: root/webkit/glue/cpp_bound_class.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-14 16:36:34 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-14 16:36:34 +0000
commit7b7965f2391594e6a3944ffee8fcdaaf18683fc3 (patch)
treec18a2c07457f2c415df42ed31827b46ec9f4611e /webkit/glue/cpp_bound_class.cc
parent901f2f391336b19c99e420e728329ab0543b5db9 (diff)
downloadchromium_src-7b7965f2391594e6a3944ffee8fcdaaf18683fc3.zip
chromium_src-7b7965f2391594e6a3944ffee8fcdaaf18683fc3.tar.gz
chromium_src-7b7965f2391594e6a3944ffee8fcdaaf18683fc3.tar.bz2
Replace pragma with MSVC macros
Review URL: http://codereview.chromium.org/6212 Patch from icefox. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/cpp_bound_class.cc')
-rw-r--r--webkit/glue/cpp_bound_class.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc
index 5e2bc4b..3b5aed7 100644
--- a/webkit/glue/cpp_bound_class.cc
+++ b/webkit/glue/cpp_bound_class.cc
@@ -14,13 +14,16 @@
#include "config.h"
+#include "base/compiler_specific.h"
+
#include "webkit/glue/cpp_bound_class.h"
#include "webkit/glue/webframe.h"
// This is required for the KJS build due to an artifact of the
// npruntime_priv.h file from JavaScriptCore/bindings.
-#pragma warning(disable:4067)
+MSVC_PUSH_DISABLE_WARNING(4067)
#include "npruntime_priv.h"
+MSVC_POP_WARNING()
#if USE(JSC)
#pragma warning(push, 0)