From b9ba75403eebdb57e2b6d542f333752116767346 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 21 Sep 2015 11:50:02 +0200
Subject: [PATCH] (GL) Fix mixe code declaration (for C89_BUILD)

---
 Makefile.common                     | 4 ++++
 gfx/drivers/gl.c                    | 4 +++-
 tools/retroarch-joyconfig-griffin.c | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.common b/Makefile.common
index 7daf140f3b..8d2470726a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -57,6 +57,10 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
    CFLAGS += -DHAVE_FILE_LOGGER
 endif
 
+ifeq ($(C89_BUILD), 1)
+	CFLAGS += -DC89_BUILD
+endif
+
 CFLAGS += -I./libretro-common/include
 
 # Switches
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index c6e1e02f2d..f98afb1800 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -1633,6 +1633,7 @@ static bool gl_frame(void *data, const void *frame,
       unsigned pitch, const char *msg)
 {
    unsigned width, height;
+   struct gfx_tex_info feedback_info;
    static struct retro_perf_counter frame_run = {0};
    gl_t                            *gl = (gl_t*)data;
    driver_t                    *driver = driver_get_ptr();
@@ -1742,7 +1743,8 @@ static bool gl_frame(void *data, const void *frame,
    gl->tex_info.tex_size[0]   = gl->tex_w;
    gl->tex_info.tex_size[1]   = gl->tex_h;
 
-   struct gfx_tex_info feedback_info = gl->tex_info;
+   feedback_info              = gl->tex_info;
+
    if (gl->fbo_feedback_enable)
    {
       const struct gfx_fbo_rect *rect = &gl->fbo_rect[gl->fbo_feedback_pass];
diff --git a/tools/retroarch-joyconfig-griffin.c b/tools/retroarch-joyconfig-griffin.c
index ed16603492..eecbddbdfe 100644
--- a/tools/retroarch-joyconfig-griffin.c
+++ b/tools/retroarch-joyconfig-griffin.c
@@ -45,9 +45,11 @@
 #include "../input/drivers_joypad/parport_joypad.c"
 #endif
 
+#ifndef C89_BUILD
 #if defined(HAVE_SDL) || defined(HAVE_SDL2)
 #include "../input/drivers_joypad/sdl_joypad.c"
 #endif
+#endif
 
 #include "../libretro-common/queues/fifo_buffer.c"
 #include "../libretro-common/file/config_file.c"