Merge branch 'master' of https://github.com/Infatum/stb into dev

This commit is contained in:
Sean Barrett 2017-07-23 14:10:17 -07:00
commit 3b232a3ff7
2 changed files with 3 additions and 0 deletions

2
stb.h
View File

@ -193,6 +193,8 @@ CREDITS
Tim Sjostrand
*/
#include <stdarg.h>
#ifndef STB__INCLUDE_STB_H
#define STB__INCLUDE_STB_H

View File

@ -577,6 +577,7 @@ enum STBVorbisError
#undef __forceinline
#endif
#define __forceinline
#define alloca __builtin_alloca
#elif !defined(_MSC_VER)
#if __GNUC__
#define __forceinline inline