From c96bf6bebfedf50553aa98d01f28a1c58f0ee734 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 8 Feb 2017 06:57:08 +0100
Subject: [PATCH] Don't add gnu99/c99 to CXXFLAGS, should be added to CFLAGS
 instead when appropriate

---
 Makefile     |  7 +------
 libretro.cpp | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 1f501649..05a4f358 100644
--- a/Makefile
+++ b/Makefile
@@ -112,13 +112,8 @@ else
 endif
 
 OBJECTS := NDS.o ARM.o ARMInterpreter.o ARMInterpreter_ALU.o ARMInterpreter_Branch.o ARMInterpreter_LoadStore.o CP15.o DMA.o GPU.o GPU2D.o GPU3D.o NDSCart.o RTC.o SPI.o Wifi.o libretro.o 
-CXXFLAGS += -I../../libretro-common/include -Wall -pedantic $(fpic)
 
-ifneq (,$(findstring qnx,$(platform)))
-CXXFLAGS += -Wc,-std=c99
-else
-CXXFLAGS += -std=gnu99
-endif
+CXXFLAGS += -I../../libretro-common/include -Wall -pedantic $(fpic)
 
 CXXFLAGS += -I../../libretro-common/include
 
diff --git a/libretro.cpp b/libretro.cpp
index a83790fe..5327e1ac 100644
--- a/libretro.cpp
+++ b/libretro.cpp
@@ -77,19 +77,17 @@ static retro_input_state_t input_state_cb;
 
 void retro_get_system_av_info(struct retro_system_av_info *info)
 {
-   float aspect = 0.0f;
-   float sampling_rate = 30000.0f;
+   float aspect                = 0.0f;
+   float sampling_rate         = 30000.0f;
 
-   info->geometry = (struct retro_game_geometry) {
-      .base_width   = 256,
-      .base_height  = 386,
-      .max_width    = 256,
-      .max_height   = 384,
-      .aspect_ratio = aspect,
-   };
+   info->geometry.base_width   = 256;
+   info->geometry.base_height  = 386;
+   info->geometry.max_width    = 256;
+   info->geometry.max_height   = 384;
+   info->geometry.aspect_ratio = aspect;
 
-   last_aspect = aspect;
-   last_sample_rate = sampling_rate;
+   last_aspect                 = aspect;
+   last_sample_rate            = sampling_rate;
 }
 
 static struct retro_rumble_interface rumble;