aboutsummaryrefslogtreecommitdiffhomepage
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
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
-rw-r--r--bench/BenchSysTimer_windows.cpp2
-rw-r--r--bench/BenchSysTimer_windows.h2
-rw-r--r--experimental/LightSymbolsUtil/lightsymbols/lightsymbols.h2
-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
-rw-r--r--src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp2
-rw-r--r--src/gpu/gl/win/SkNativeGLContext_win.cpp2
-rw-r--r--src/ports/SkDebug_win.cpp2
-rw-r--r--src/utils/win/SkAutoCoInitialize.cpp2
-rw-r--r--src/utils/win/SkIStream.cpp2
-rw-r--r--src/views/win/skia_win.cpp2
14 files changed, 14 insertions, 14 deletions
diff --git a/bench/BenchSysTimer_windows.cpp b/bench/BenchSysTimer_windows.cpp
index 1c4e4049c8..fab657a8c3 100644
--- a/bench/BenchSysTimer_windows.cpp
+++ b/bench/BenchSysTimer_windows.cpp
@@ -9,7 +9,7 @@
//Time
#define WIN32_LEAN_AND_MEAN 1
-#include <Windows.h>
+#include <windows.h>
static ULONGLONG winCpuTime() {
FILETIME createTime;
diff --git a/bench/BenchSysTimer_windows.h b/bench/BenchSysTimer_windows.h
index c3d0c9b9c9..469332e4ed 100644
--- a/bench/BenchSysTimer_windows.h
+++ b/bench/BenchSysTimer_windows.h
@@ -10,7 +10,7 @@
//Time
#define WIN32_LEAN_AND_MEAN 1
-#include <Windows.h>
+#include <windows.h>
class BenchSysTimer {
public:
diff --git a/experimental/LightSymbolsUtil/lightsymbols/lightsymbols.h b/experimental/LightSymbolsUtil/lightsymbols/lightsymbols.h
index 53c2f3653f..02494e63b5 100644
--- a/experimental/LightSymbolsUtil/lightsymbols/lightsymbols.h
+++ b/experimental/LightSymbolsUtil/lightsymbols/lightsymbols.h
@@ -7,7 +7,7 @@
#include <stdlib.h>
//#include <pthread.h>
-#include <Windows.h>
+#include <windows.h>
typedef char* SZ;
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;
diff --git a/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
index e9207b162a..06e406f859 100644
--- a/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
+++ b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
@@ -11,7 +11,7 @@
#include "gl/GrGLInterface.h"
#include "gl/GrGLUtil.h"
#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
/*
* Windows makes the GL funcs all be __stdcall instead of __cdecl :(
diff --git a/src/gpu/gl/win/SkNativeGLContext_win.cpp b/src/gpu/gl/win/SkNativeGLContext_win.cpp
index d8777274bc..392c2bc97d 100644
--- a/src/gpu/gl/win/SkNativeGLContext_win.cpp
+++ b/src/gpu/gl/win/SkNativeGLContext_win.cpp
@@ -10,7 +10,7 @@
#include "SkWGL.h"
#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
SkNativeGLContext::AutoContextRestore::AutoContextRestore() {
fOldHGLRC = wglGetCurrentContext();
diff --git a/src/ports/SkDebug_win.cpp b/src/ports/SkDebug_win.cpp
index 599b133e54..fe28ee27b1 100644
--- a/src/ports/SkDebug_win.cpp
+++ b/src/ports/SkDebug_win.cpp
@@ -14,7 +14,7 @@ static const size_t kBufferSize = 2048;
#include <stdarg.h>
#include <stdio.h>
-#include <Windows.h>
+#include <windows.h>
void SkDebugf(const char format[], ...) {
char buffer[kBufferSize + 1];
diff --git a/src/utils/win/SkAutoCoInitialize.cpp b/src/utils/win/SkAutoCoInitialize.cpp
index dd6e9368d6..89115bfe41 100644
--- a/src/utils/win/SkAutoCoInitialize.cpp
+++ b/src/utils/win/SkAutoCoInitialize.cpp
@@ -8,7 +8,7 @@
#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
#include <ole2.h>
#include "SkAutoCoInitialize.h"
diff --git a/src/utils/win/SkIStream.cpp b/src/utils/win/SkIStream.cpp
index 0386ea78d7..74d814ccb1 100644
--- a/src/utils/win/SkIStream.cpp
+++ b/src/utils/win/SkIStream.cpp
@@ -8,7 +8,7 @@
#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
#include <ole2.h>
#include "SkIStream.h"
#include "SkStream.h"
diff --git a/src/views/win/skia_win.cpp b/src/views/win/skia_win.cpp
index 2d66bd8280..72ff54fedd 100644
--- a/src/views/win/skia_win.cpp
+++ b/src/views/win/skia_win.cpp
@@ -5,7 +5,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include <Windows.h>
+#include <windows.h>
#include <tchar.h>
#include "SkApplication.h"