Include windows.h from one place to ensure that min and max macros are not defined.

src/common/debug.cpp

@@ -10,8 +10,9 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+
+#include "common/system.h"
 #include <d3d9.h>
-#include <windows.h>
 
 namespace gl
 {

src/common/system.h

+//
+// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// system.h: Includes Windows system headers and undefines macros that conflict.
+
+#ifndef COMMON_SYSTEM_H
+#define COMMON_SYSTEM_H
+
+#if !defined(WIN32_LEAN_AND_MEAN)
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <windows.h>
+
+#if defined(min)
+#undef min
+#endif
+
+#if defined(max)
+#undef max
+#endif
+
+#endif   // COMMON_SYSTEM_H

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 1
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1722
+#define BUILD_REVISION 1729
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libEGL/Display.h

@@ -11,10 +11,7 @@
 #ifndef LIBEGL_DISPLAY_H_
 #define LIBEGL_DISPLAY_H_
 
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
+#include "common/system.h"
 
 #include <set>
 #include <vector>

src/libGLESv2/libGLESv2.vcxproj

@@ -280,6 +280,8 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
     <ClCompile Include="utilities.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\debug.h" />
+    <ClInclude Include="..\common\system.h" />
     <ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" />
     <ClInclude Include="angletypes.h" />
     <ClInclude Include="BinaryStream.h" />

src/libGLESv2/libGLESv2.vcxproj.filters

@@ -397,6 +397,12 @@
     <ClInclude Include="renderer\shaders\compiled\clear11vs.h">
       <Filter>Renderer\Shaders\Compiled</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\system.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\debug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="libGLESv2.def">

src/libGLESv2/mathutil.h

@@ -11,7 +11,8 @@
 
 #include <intrin.h>
 #include <math.h>
-#include <windows.h>
+
+#include "common/system.h"
 
 namespace gl
 {

src/libGLESv2/utilities.cpp

@@ -10,10 +10,9 @@
 
 #include <limits>
 #include <stdio.h>
-#include <windows.h>
 
 #include "common/debug.h"
-
+#include "common/system.h"
 #include "libGLESv2/mathutil.h"
 #include "libGLESv2/Context.h"