From b7be8d90d833e18eabc7ddc01690978f156afade Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Sun, 12 Aug 2012 22:31:47 +0200
Subject: [PATCH 1/2] Renamed libglfw3.pc to glfw3.pc.

---
 CMakeLists.txt                      | 6 +++---
 src/{libglfw3.pc.in => glfw3.pc.in} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{libglfw3.pc.in => glfw3.pc.in} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27a609a6..cd712c46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -262,10 +262,10 @@ install(FILES COPYING.txt readme.html
 # Create and install pkg-config file on supported platforms
 #--------------------------------------------------------------------
 if (_GLFW_X11_GLX OR _GLFW_COCOA_NSGL)
-    configure_file(${GLFW_SOURCE_DIR}/src/libglfw3.pc.in
-                   ${GLFW_BINARY_DIR}/src/libglfw3.pc @ONLY)
+    configure_file(${GLFW_SOURCE_DIR}/src/glfw3.pc.in
+                   ${GLFW_BINARY_DIR}/src/glfw3.pc @ONLY)
 
-    install(FILES ${GLFW_BINARY_DIR}/src/libglfw3.pc
+    install(FILES ${GLFW_BINARY_DIR}/src/glfw3.pc
             DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 endif()
 
diff --git a/src/libglfw3.pc.in b/src/glfw3.pc.in
similarity index 100%
rename from src/libglfw3.pc.in
rename to src/glfw3.pc.in

From 6399fb19fd91b809217a5602083e858479b1067a Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Tue, 14 Aug 2012 13:51:39 +0200
Subject: [PATCH 2/2] Included malloc.h from files using malloc on Win32.

---
 src/fullscreen.c       | 1 +
 src/win32_clipboard.c  | 1 +
 src/win32_fullscreen.c | 1 +
 src/win32_init.c       | 1 +
 src/win32_opengl.c     | 1 +
 src/win32_window.c     | 1 +
 src/window.c           | 1 +
 7 files changed, 7 insertions(+)

diff --git a/src/fullscreen.c b/src/fullscreen.c
index d613ab7e..9dab1a59 100644
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -31,6 +31,7 @@
 #include "internal.h"
 
 #include <stdlib.h>
+#include <malloc.h>
 
 
 //========================================================================
diff --git a/src/win32_clipboard.c b/src/win32_clipboard.c
index 2b8742ce..ca31964d 100644
--- a/src/win32_clipboard.c
+++ b/src/win32_clipboard.c
@@ -32,6 +32,7 @@
 #include <limits.h>
 #include <string.h>
 #include <stdlib.h>
+#include <malloc.h>
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/win32_fullscreen.c b/src/win32_fullscreen.c
index c04e5ff1..3e28e30e 100644
--- a/src/win32_fullscreen.c
+++ b/src/win32_fullscreen.c
@@ -32,6 +32,7 @@
 
 #include <stdlib.h>
 #include <limits.h>
+#include <malloc.h>
 
 
 //========================================================================
diff --git a/src/win32_init.c b/src/win32_init.c
index 5bcbb310..41444b97 100644
--- a/src/win32_init.c
+++ b/src/win32_init.c
@@ -31,6 +31,7 @@
 #include "internal.h"
 
 #include <stdlib.h>
+#include <malloc.h>
 
 #ifdef __BORLANDC__
 // With the Borland C++ compiler, we want to disable FPU exceptions
diff --git a/src/win32_opengl.c b/src/win32_opengl.c
index 345b7289..2c676c91 100644
--- a/src/win32_opengl.c
+++ b/src/win32_opengl.c
@@ -31,6 +31,7 @@
 #include "internal.h"
 
 #include <stdlib.h>
+#include <malloc.h>
 
 
 //========================================================================
diff --git a/src/win32_window.c b/src/win32_window.c
index 65122eef..77b99026 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -32,6 +32,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <malloc.h>
 
 
 //========================================================================
diff --git a/src/window.c b/src/window.c
index 8da2f580..1e169743 100644
--- a/src/window.c
+++ b/src/window.c
@@ -32,6 +32,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <malloc.h>
 
 
 //========================================================================