From d40da6aca373ab225e5a8d1bc17ca309b4c4f261 Mon Sep 17 00:00:00 2001
From: orbea <orbea@fredslev.dk>
Date: Sun, 16 Dec 2018 07:41:59 -0800
Subject: [PATCH] Fix c89 'keyword is hidden by macro definition' with clang.

---
 deps/stb/stb_rect_pack.h                | 4 ++--
 deps/stb/stb_truetype.h                 | 2 +-
 gfx/drivers_font_renderer/stb.c         | 4 ++--
 gfx/drivers_font_renderer/stb_unicode.c | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deps/stb/stb_rect_pack.h b/deps/stb/stb_rect_pack.h
index ed1585ba19..3130974611 100644
--- a/deps/stb/stb_rect_pack.h
+++ b/deps/stb/stb_rect_pack.h
@@ -45,7 +45,7 @@
 #define STB_RECT_PACK_VERSION  1
 
 #ifdef STBRP_STATIC
-#define STBRP_DEF static
+#define STBRP_DEF STATIC
 #else
 #define STBRP_DEF extern
 #endif
@@ -498,7 +498,7 @@ static int rect_height_compare(const void *a, const void *b)
    return (p->w > q->w) ? -1 : (p->w < q->w);
 }
 
-static int rect_width_compare(const void *a, const void *b)
+STBRP_DEF int rect_width_compare(const void *a, const void *b)
 {
    stbrp_rect *p = (stbrp_rect *) a;
    stbrp_rect *q = (stbrp_rect *) b;
diff --git a/deps/stb/stb_truetype.h b/deps/stb/stb_truetype.h
index 13bb283f16..7c67a1fc28 100644
--- a/deps/stb/stb_truetype.h
+++ b/deps/stb/stb_truetype.h
@@ -288,7 +288,7 @@
 #define __STB_INCLUDE_STB_TRUETYPE_H__
 
 #ifdef STBTT_STATIC
-#define STBTT_DEF static
+#define STBTT_DEF STATIC
 #else
 #define STBTT_DEF extern
 #endif
diff --git a/gfx/drivers_font_renderer/stb.c b/gfx/drivers_font_renderer/stb.c
index 7b7a59163f..bbe23f2f90 100644
--- a/gfx/drivers_font_renderer/stb.c
+++ b/gfx/drivers_font_renderer/stb.c
@@ -28,10 +28,10 @@
 #define STB_RECT_PACK_IMPLEMENTATION
 #define STBTT_STATIC
 #define STBRP_STATIC
-#define static static INLINE
+#define STATIC static INLINE
 #include "../../deps/stb/stb_rect_pack.h"
 #include "../../deps/stb/stb_truetype.h"
-#undef static
+#undef STATIC
 #endif
 
 typedef struct
diff --git a/gfx/drivers_font_renderer/stb_unicode.c b/gfx/drivers_font_renderer/stb_unicode.c
index 5e163e3560..8ed34eb61b 100644
--- a/gfx/drivers_font_renderer/stb_unicode.c
+++ b/gfx/drivers_font_renderer/stb_unicode.c
@@ -32,10 +32,10 @@
 #define STB_RECT_PACK_IMPLEMENTATION
 #define STBTT_STATIC
 #define STBRP_STATIC
-#define static static INLINE
+#define STATIC static INLINE
 #include "../../deps/stb/stb_rect_pack.h"
 #include "../../deps/stb/stb_truetype.h"
-#undef static
+#undef STATIC
 #endif
 
 #define STB_UNICODE_ATLAS_ROWS 16