From 76eefcc08aff80531cab410169c8e4ddf29cad7b Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Thu, 6 Mar 2014 21:05:55 +0100
Subject: [PATCH] Moved some VC++ specific hacks to platform header.

---
 src/gamma.c          | 4 ----
 src/monitor.c        | 5 -----
 src/win32_platform.h | 5 +++++
 src/window.c         | 3 ---
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/gamma.c b/src/gamma.c
index a7ddfcd9..945e886b 100644
--- a/src/gamma.c
+++ b/src/gamma.c
@@ -30,10 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(_MSC_VER)
- #include <malloc.h>
-#endif
-
 
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW internal API                      //////
diff --git a/src/monitor.c b/src/monitor.c
index 02f7c6af..88fada04 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -31,11 +31,6 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#if defined(_MSC_VER)
- #include <malloc.h>
- #define strdup _strdup
-#endif
-
 
 // Lexical comparison function for GLFW video modes, used by qsort
 //
diff --git a/src/win32_platform.h b/src/win32_platform.h
index a265f050..968a79da 100644
--- a/src/win32_platform.h
+++ b/src/win32_platform.h
@@ -62,6 +62,11 @@
  #define _WIN32_WINNT 0x0501
 #endif
 
+#if defined(_MSC_VER)
+ #include <malloc.h>
+ #define strdup _strdup
+#endif
+
 #include <windows.h>
 #include <mmsystem.h>
 #include <dbt.h>
diff --git a/src/window.c b/src/window.c
index 63e76bf8..cecfd5ed 100644
--- a/src/window.c
+++ b/src/window.c
@@ -30,9 +30,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#if defined(_MSC_VER)
- #include <malloc.h>
-#endif
 
 
 // Return the maxiumum of the specified values