avoid __forceinline in mingw since their definition for C is broken;
dummy definitions for malloc et al (note you have to modify source to make this work though anyway); tweak credits change;
This commit is contained in:
parent
2b57ea95da
commit
0860860af6
17
stb_vorbis.c
17
stb_vorbis.c
@ -4,7 +4,7 @@
|
|||||||
// Original version written by Sean Barrett in 2007.
|
// Original version written by Sean Barrett in 2007.
|
||||||
//
|
//
|
||||||
// Originally sponsored by RAD Game Tools. Seeking sponsored
|
// Originally sponsored by RAD Game Tools. Seeking sponsored
|
||||||
// by Phillip Bennefall, Marc Andersen, Elias Software, vgstorm.com,
|
// by Phillip Bennefall, Marc Andersen, Aaron Baker, Elias Software,
|
||||||
// Aras Pranckevicius, and Sean Barrett.
|
// Aras Pranckevicius, and Sean Barrett.
|
||||||
//
|
//
|
||||||
// LICENSE
|
// LICENSE
|
||||||
@ -557,11 +557,24 @@ enum STBVorbisError
|
|||||||
#endif
|
#endif
|
||||||
#else // STB_VORBIS_NO_CRT
|
#else // STB_VORBIS_NO_CRT
|
||||||
#define NULL 0
|
#define NULL 0
|
||||||
|
#define malloc(s) 0
|
||||||
|
#define free(s) ((void) 0)
|
||||||
|
#define realloc(s) 0
|
||||||
#endif // STB_VORBIS_NO_CRT
|
#endif // STB_VORBIS_NO_CRT
|
||||||
|
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
#if !defined(_MSC_VER) && !(defined(__MINGW32__) && defined(__forceinline))
|
#ifdef __MINGW32__
|
||||||
|
// eff you mingw:
|
||||||
|
// "fixed":
|
||||||
|
// http://sourceforge.net/p/mingw-w64/mailman/message/32882927/
|
||||||
|
// "no that broke the build, reverted, who cares about C":
|
||||||
|
// http://sourceforge.net/p/mingw-w64/mailman/message/32890381/
|
||||||
|
#ifdef __forceinline
|
||||||
|
#undef __forceinline
|
||||||
|
#endif
|
||||||
|
#define __forceinline
|
||||||
|
#elif !defined(_MSC_VER)
|
||||||
#if __GNUC__
|
#if __GNUC__
|
||||||
#define __forceinline inline
|
#define __forceinline inline
|
||||||
#else
|
#else
|
||||||
|
@ -130,6 +130,10 @@ SOURCE=..\stb_leakcheck.h
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\stb_malloc.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\stb_perlin.h
|
SOURCE=..\stb_perlin.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
Loading…
Reference in New Issue
Block a user