From 8f2d28e4e5be983a09ea60b68d948992859fe8eb Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 1 Jul 2017 11:01:46 +0200
Subject: [PATCH] C89 buildfixes

---
 src/drivers/libretro/libretro.c |  5 +++--
 src/ppu.c                       | 11 +++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index a7ef22f..fcc29a9 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -800,6 +800,8 @@ static void retro_set_custom_palette (void)
 void FCEUD_RegionOverride(int region)
 {
    static int w = 0;
+   struct retro_system_av_info av_info;
+
    switch (region)
    {
       case 0: /* auto */
@@ -831,7 +833,6 @@ void FCEUD_RegionOverride(int region)
 	SetSoundVariables();
 
    // Update the geometry
-   struct retro_system_av_info av_info;
    retro_get_system_av_info(&av_info);
    environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &av_info);
 }
@@ -880,6 +881,7 @@ static void check_variables(bool startup)
    struct retro_variable var = {0};
    struct retro_system_av_info av_info;
    bool geometry_update = false;
+   unsigned old_regionoverride = regionoverride;
 
    var.key = "fceumm_palette";
 
@@ -1057,7 +1059,6 @@ static void check_variables(bool startup)
          turbo_delay = 60;
       }
    }
-   unsigned old_regionoverride = regionoverride;
    var.key = "fceumm_region";
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
diff --git a/src/ppu.c b/src/ppu.c
index a59a25c..87b2788 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -661,16 +661,19 @@ static void Fixit1(void) {
 }
 
 void MMC5_hb(int);		//Ugh ugh ugh.
-static void DoLine(void) {
-   if (scanline >= 240 && scanline != totalscanlines) {
+static void DoLine(void)
+{
+   int x;
+   uint8 *target = NULL;
+   if (scanline >= 240 && scanline != totalscanlines)
+   {
 		X6502_Run(256 + 69);
 		scanline++;
 		X6502_Run(16);
 		return;
 	}
 
-	int x;
-	uint8 *target = XBuf + ((scanline < 240 ? scanline : 240) << 8);
+	target = XBuf + ((scanline < 240 ? scanline : 240) << 8);
 
 	if (MMC5Hack && (ScreenON || SpriteON)) MMC5_hb(scanline);