Fix windows embedder builds. (#6137)

flutter · Sep 1, 2018 · f25d89a · f25d89a
1 parent b3c778f
commit f25d89a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/shell/platform/embedder/embedder_surface_gl.cc b/shell/platform/embedder/embedder_surface_gl.cc
@@ -6,6 +6,10 @@
 
 #include "flutter/shell/common/io_manager.h"
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 namespace shell {
 
 EmbedderSurfaceGL::EmbedderSurfaceGL(GLDispatchTable gl_dispatch_table,

diff --git a/shell/platform/embedder/embedder_surface_software.cc b/shell/platform/embedder/embedder_surface_software.cc
@@ -7,6 +7,10 @@
 #include "flutter/fml/trace_event.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 namespace shell {
 
 EmbedderSurfaceSoftware::EmbedderSurfaceSoftware(

diff --git a/shell/platform/embedder/platform_view_embedder.cc b/shell/platform/embedder/platform_view_embedder.cc
@@ -4,6 +4,10 @@
 
 #include "flutter/shell/platform/embedder/platform_view_embedder.h"
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 namespace shell {
 
 PlatformViewEmbedder::PlatformViewEmbedder(