mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27 from mrneo240/master

Browse Source 
Minor Changes to allow windows to cleanly compile
This commit is contained in:
Luke Benstead 2018-10-18 09:45:44 +01:00 committed by GitHub
commit 78f5fc698a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
containers/aligned_vector.c
View File

@ -3,8 +3,12 @@
#include <math.h> #include <math.h>
#ifndef __APPLE__ #ifndef __APPLE__
#include <malloc.h> #if defined(__WIN32__)
/* Linux + Kos define this, OSX does not, so just use malloc there */
#define memalign(x, size) malloc((size))
#else #else
#include <malloc.h>
#endif
/* Linux + Kos define this, OSX does not, so just use malloc there */ /* Linux + Kos define this, OSX does not, so just use malloc there */
#define memalign(x, size) malloc((size)) #define memalign(x, size) malloc((size))
#endif #endif

6
containers/stack.c
View File

@ -1,8 +1,12 @@
#include <string.h> #include <string.h>
#ifndef __APPLE__ #ifndef __APPLE__
#include <malloc.h> #if defined(__WIN32__)
/* Linux + Kos define this, OSX does not, so just use malloc there */
#define memalign(x, size) malloc((size))
#else #else
#include <malloc.h>
#endif
/* Linux + Kos define this, OSX does not, so just use malloc there */ /* Linux + Kos define this, OSX does not, so just use malloc there */
#define memalign(x, size) malloc((size)) #define memalign(x, size) malloc((size))
#endif #endif