summaryrefslogtreecommitdiffstats
path: root/webkit/glue/glue_serialize.cc
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-16 21:46:14 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-16 21:46:14 +0000
commitfa41969da48955ec4b4ab30589db22322e065a32 (patch)
tree4a165afed24e0c4dc38bcd485100d8d56397da40 /webkit/glue/glue_serialize.cc
parent812eaca72f309bcbb51ee8f386a7d33429c3a314 (diff)
downloadchromium_src-fa41969da48955ec4b4ab30589db22322e065a32.zip
chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.tar.gz
chromium_src-fa41969da48955ec4b4ab30589db22322e065a32.tar.bz2
Replace MSVC pragmas with the macro. Also adds two files
from webkit/glue to the build rule. Patch from icefox (TorchMobile) http://codereview.chromium.org/7418 Review URL: http://codereview.chromium.org/7454 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/glue_serialize.cc')
-rw-r--r--webkit/glue/glue_serialize.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc
index 925da42..dc44c20 100644
--- a/webkit/glue/glue_serialize.cc
+++ b/webkit/glue/glue_serialize.cc
@@ -5,11 +5,13 @@
#include "config.h"
#include <string>
-#pragma warning(push, 0)
+#include "base/compiler_specific.h"
+
+MSVC_PUSH_WARNING_LEVEL(0);
#include "HistoryItem.h"
#include "PlatformString.h"
#include "ResourceRequest.h"
-#pragma warning(pop)
+MSVC_POP_WARNING();
#undef LOG
#include "webkit/glue/glue_serialize.h"