aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-03 15:23:37 +0000
committerGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-03 15:23:37 +0000
commit0d9e3da8bb853c5ed96d13646a4264eb57b13a2a (patch)
treeeef6a307bb54c3ef2253daabbfce0b200572af54 /include
parent9716586184931bb338fa41e59e216f012496e80d (diff)
Use lowercase windows.h in includes to fix Windows cross compilation using mingw.
While it doesn't matter on Windows, mingw on case-sensitive OSes uses all lower case filenames for platform include files. I found the problem in SkCondVar.h from Mozilla checkout of skia sources, but the patch contains a fix for the whole skia tree. R=bungeman@google.com Review URL: https://codereview.chromium.org/99173003 git-svn-id: http://skia.googlecode.com/svn/trunk@12461 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/gpu/gl/SkNativeGLContext.h2
-rw-r--r--include/utils/SkCondVar.h2
-rw-r--r--include/utils/SkWGL.h2
-rw-r--r--include/utils/win/SkAutoCoInitialize.h2
-rw-r--r--include/utils/win/SkIStream.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/include/gpu/gl/SkNativeGLContext.h b/include/gpu/gl/SkNativeGLContext.h
index a18c443165..7254de1509 100644
--- a/include/gpu/gl/SkNativeGLContext.h
+++ b/include/gpu/gl/SkNativeGLContext.h
@@ -19,7 +19,7 @@
#include <X11/Xlib.h>
#include <GL/glx.h>
#elif defined(SK_BUILD_FOR_WIN32)
- #include <Windows.h>
+ #include <windows.h>
#include <GL/GL.h>
#endif
diff --git a/include/utils/SkCondVar.h b/include/utils/SkCondVar.h
index 15f16e662f..861a2aba8a 100644
--- a/include/utils/SkCondVar.h
+++ b/include/utils/SkCondVar.h
@@ -11,7 +11,7 @@
#ifdef SK_USE_POSIX_THREADS
#include <pthread.h>
#elif defined(SK_BUILD_FOR_WIN32)
-#include <Windows.h>
+#include <windows.h>
#endif
/**
diff --git a/include/utils/SkWGL.h b/include/utils/SkWGL.h
index 6803e036e5..5f630a1689 100644
--- a/include/utils/SkWGL.h
+++ b/include/utils/SkWGL.h
@@ -27,7 +27,7 @@
#define WIN32_LEAN_AND_MEAN
#define SK_LOCAL_LEAN_AND_MEAN
#endif
-#include <Windows.h>
+#include <windows.h>
#if defined(SK_LOCAL_LEAN_AND_MEAN)
#undef WIN32_LEAN_AND_MEAN
#undef SK_LOCAL_LEAN_AND_MEAN
diff --git a/include/utils/win/SkAutoCoInitialize.h b/include/utils/win/SkAutoCoInitialize.h
index 709fa6bab9..f671e68205 100644
--- a/include/utils/win/SkAutoCoInitialize.h
+++ b/include/utils/win/SkAutoCoInitialize.h
@@ -11,7 +11,7 @@
#define SkAutoCo_DEFINED
#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
#include "SkTemplates.h"
/**
diff --git a/include/utils/win/SkIStream.h b/include/utils/win/SkIStream.h
index e4e045c988..deb3f3b004 100644
--- a/include/utils/win/SkIStream.h
+++ b/include/utils/win/SkIStream.h
@@ -11,7 +11,7 @@
#define SkIStream_DEFINED
#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
#include <ole2.h>
class SkStream;