From fda335609f25d717d84f1e08026d5cb728764bd9 Mon Sep 17 00:00:00 2001
From: Nicolas Guillemot <nlguillemot@gmail.com>
Date: Sat, 18 Apr 2015 20:39:46 -0700
Subject: [PATCH 1/2] don't redefine __forceinline with mingw

mingw redefines __forceinline (though I don't think this applies to all
versions of mingw.) Therefore, don't redefine it if mingw has already
defined it.
---
 stb_vorbis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stb_vorbis.c b/stb_vorbis.c
index ef346fc..4920eb6 100644
--- 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

From 1894bede3f88007b78aca6130af7ff556e8929c5 Mon Sep 17 00:00:00 2001
From: Nicolas Guillemot <nlguillemot@gmail.com>
Date: Sat, 18 Apr 2015 21:23:34 -0700
Subject: [PATCH 2/2] fix signed/unsignted compare warning

---
 stb_image.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stb_image.h b/stb_image.h
index 01d74d3..d3ee077 100644
--- a/stb_image.h
+++ b/stb_image.h
@@ -1646,7 +1646,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;