summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 19:34:45 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 19:34:45 +0000
commit5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac (patch)
treeb3b4d32437596c5462b1907e6c68f2db2d15b8a0 /chrome/renderer
parent186bf92abfcce5136acb040c301959ff6ca96028 (diff)
downloadchromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.zip
chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.tar.gz
chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.tar.bz2
Revert 80819 due to failed tests
TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/6816024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/renderer_glue.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 84a7ff8..3e40ea3 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -43,7 +43,9 @@
#include "native_client/src/trusted/plugin/nacl_entry_points.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_WIN)
+#include <strsafe.h> // note: per msdn docs, this must *follow* other includes
+#elif defined(OS_LINUX)
#include "content/renderer/renderer_sandbox_support_linux.h"
#endif