From 0860860af60659d5803cbc5ecc6a932029b435c2 Mon Sep 17 00:00:00 2001 From: Sean Barrett Date: Sat, 16 Jan 2016 07:19:27 -0800 Subject: [PATCH] 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; --- stb_vorbis.c | 17 +++++++++++++++-- tests/stb.dsp | 4 ++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/stb_vorbis.c b/stb_vorbis.c index ea753df..904209f 100644 --- a/stb_vorbis.c +++ b/stb_vorbis.c @@ -4,7 +4,7 @@ // Original version written by Sean Barrett in 2007. // // 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. // // LICENSE @@ -557,11 +557,24 @@ enum STBVorbisError #endif #else // STB_VORBIS_NO_CRT #define NULL 0 +#define malloc(s) 0 +#define free(s) ((void) 0) +#define realloc(s) 0 #endif // STB_VORBIS_NO_CRT #include -#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__ #define __forceinline inline #else diff --git a/tests/stb.dsp b/tests/stb.dsp index b4e1748..3dcb5c9 100644 --- a/tests/stb.dsp +++ b/tests/stb.dsp @@ -130,6 +130,10 @@ SOURCE=..\stb_leakcheck.h # End Source File # Begin Source File +SOURCE=..\stb_malloc.h +# End Source File +# Begin Source File + SOURCE=..\stb_perlin.h # End Source File # Begin Source File