Merge branch 'master' of https://github.com/nguillemot/stb

ago%!(EXTRA string=10 years) · 8f9c8b682d
parent b4b196af1c 1894bede3f
commit 8f9c8b682d
2 changed files with 2 additions and 2 deletions
--- a/stb_image.h
+++ b/stb_image.h
@ -1645,7 +1645,7 @@ stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n)

   sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB
   k = stbi_lrot(j->code_buffer, n);
-   STBI_ASSERT(n >= 0 && n < sizeof(stbi__bmask)/sizeof(*stbi__bmask));
+   STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask)));
   j->code_buffer = k & ~stbi__bmask[n];
   k &= stbi__bmask[n];
   j->code_bits -= n;
--- a/stb_vorbis.c
+++ b/stb_vorbis.c
@ -553,7 +553,7 @@ enum STBVorbisError
 #define NULL 0
 #endif

-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !(defined(__MINGW32__) && defined(__forceinline))
   #if __GNUC__
      #define __forceinline inline
   #else