Merge branch 'master' of github.com:elmindreda/glfw

This commit is contained in:
Camilla Berglund
2012-08-26 15:39:10 +02:00
3 changed files with 15 additions and 4 deletions
+5
View File
@@ -6,6 +6,7 @@
//------------------------------------------------------------------------
// Copyright (c) 2002-2006 Marcus Geelnard
// Copyright (c) 2006-2010 Camilla Berglund <elmindreda@elmindreda.org>
// Copyright (c) 2012 Torsten Walluhn <tw@mad-cad.net>
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
@@ -31,7 +32,11 @@
#include "internal.h"
#include <stdlib.h>
#ifdef __APPLE__
#include <sys/malloc.h>
#else
#include <malloc.h>
#endif
//========================================================================