summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 05:53:53 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 05:53:53 +0000
commit5d39ab4fbb6e21de09a538a2c3e0f378b673c86d (patch)
tree163d5034a9a4c13509a7cfd12286128513ee0744 /media/base
parenta1d75907b05a3da06f29d1a69c273498cb8e2f2d (diff)
downloadchromium_src-5d39ab4fbb6e21de09a538a2c3e0f378b673c86d.zip
chromium_src-5d39ab4fbb6e21de09a538a2c3e0f378b673c86d.tar.gz
chromium_src-5d39ab4fbb6e21de09a538a2c3e0f378b673c86d.tar.bz2
Make chrome compile with the win8 sdk
So we can move the metro bits to \src FACILITY_VISUALCPP is now defined in the sdk BUG=127799 TEST= it builds Review URL: https://chromiumcodereview.appspot.com/10656036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/media_win.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/base/media_win.cc b/media/base/media_win.cc
index 9751892..c9c3179 100644
--- a/media/base/media_win.cc
+++ b/media/base/media_win.cc
@@ -5,6 +5,10 @@
#include "media/base/media.h"
#include <windows.h>
+#if defined(_WIN32_WINNT_WIN8)
+// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h.
+#undef FACILITY_VISUALCPP
+#endif
#include <delayimp.h>
#include "base/file_path.h"