Merge pull request #9 from Mtgxyz/master

malloc.h is linux specific and should NOT be used.
This commit is contained in:
Steveice10 2016-08-27 10:21:42 -07:00 committed by GitHub
commit 1a6b2b5bd4
2 changed files with 3 additions and 2 deletions

View File

@ -2,6 +2,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <sstream>

View File

@ -551,7 +551,7 @@ enum STBVorbisError
#include <assert.h>
#include <math.h>
#if !(defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || defined(Macintosh))
#include <malloc.h>
#include <stdlib.h>
#endif
#else // STB_VORBIS_NO_CRT
#define NULL 0