From e3c7dcae28888683fbb1da9138007498f1e8476c Mon Sep 17 00:00:00 2001
From: Alcaro <floating@muncher.se>
Date: Tue, 22 Sep 2015 16:53:30 +0200
Subject: [PATCH] Remove those C89 checks, they're done elsewhere now.

---
 Makefile.common     | 24 ------------------------
 qb/config.params.sh |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 6319cfcb24..a76c417441 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -212,13 +212,10 @@ OBJ += frontend/frontend.o \
 
 OBJ += gfx/image/image.o
 
-ifneq ($(C89_BUILD), 1)
-# stb_image is not a C89/C90-compliant API.
 ifeq ($(HAVE_IMAGEVIEWER), 1)
 DEFINES += -DHAVE_IMAGEVIEWER
 OBJ += cores/image_core.o
 endif
-endif
 
 # Qt
 
@@ -247,14 +244,11 @@ ifeq ($(HAVE_STDIN_CMD), 1)
    DEFINES += -DHAVE_COMMAND -DHAVE_STDIN_CMD
 endif
 
-ifneq ($(C89_BUILD), 1)
-# Python 3.x bindings are not C89/C90-compliant.
 ifeq ($(HAVE_PYTHON), 1)
    DEFINES += $(PYTHON_CFLAGS) -Wno-unused-parameter
    LIBS += $(PYTHON_LIBS)
    OBJ += gfx/video_state_python.o
 endif
-endif
 
 ifeq ($(HAVE_EMSCRIPTEN), 1)
 OBJ += frontend/drivers/platform_emscripten.o \
@@ -314,14 +308,11 @@ ifeq ($(HAVE_JACK),1)
    DEFINES += $(JACK_CFLAGS)
 endif
 
-ifneq ($(C89_BUILD), 1)
-# PulseAudio is not a C89/C90-compliant API.
 ifeq ($(HAVE_PULSE), 1)
    OBJ += audio/drivers/pulse.o
    LIBS += $(PULSE_LIBS)
    DEFINES += $(PULSE_CFLAGS)
 endif
-endif
 
 ifeq ($(HAVE_OSS_LIB), 1)
    LIBS += -lossaudio
@@ -471,14 +462,11 @@ endif
 
 #Input
 
-ifneq ($(C89_BUILD), 1)
-# Wayland is not a C89/C90-compliant API.
 ifeq ($(HAVE_WAYLAND), 1)
  #OBJ += input/drivers/wayland.o
  DEFINES += $(WAYLAND_CFLAGS)
  LIBS += $(WAYLAND_LIBS)
 endif
-endif
 
 ifeq ($(HAVE_DINPUT), 1)
    LIBS += -ldinput8 -ldxguid -lole32
@@ -516,8 +504,6 @@ ifeq ($(HAVE_UDEV), 1)
 			 input/drivers_joypad/udev_joypad.o
 endif
 
-ifneq ($(C89_BUILD), 1)
-# libusb is not a C89/C90-compliant API.
 ifeq ($(HAVE_LIBUSB), 1)
 	DEFINES += -DHAVE_LIBUSB
 	OBJ += input/drivers_hid/libusb_hid.o
@@ -525,7 +511,6 @@ ifeq ($(HAVE_LIBUSB), 1)
 	JOYCONFIG_LIBS += -lusb-1.0
 	HAVE_HID = 1
 endif
-endif
 
 ifeq ($(HAVE_IOHIDMANAGER), 1)
 	DEFINES += -DHAVE_IOHIDMANAGER
@@ -605,14 +590,11 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
 		endif
    endif
 
-ifneq ($(C89_BUILD), 1)
-	# Wayland is not a C89/C90-compliant API.
    ifeq ($(HAVE_WAYLAND), 1)
 	   ifeq ($(HAVE_EGL), 1)
 	     OBJ += gfx/drivers_context/wayland_ctx.o
       endif
    endif
-endif
 	
    ifeq ($(HAVE_GLES), 1)
       LIBS += $(GLES_LIBS)
@@ -658,8 +640,6 @@ ifeq ($(HAVE_SDL), 1)
    LIBS += $(SDL_LIBS)
 endif
 
-# SDL_syswm.h is not C89/C90-compliant.
-ifneq ($(C89_BUILD), 1)
 ifeq ($(HAVE_SDL2), 1)
    OBJ += gfx/drivers/sdl2_gfx.o \
 			 input/drivers/sdl_input.o \
@@ -675,7 +655,6 @@ ifeq ($(HAVE_SDL2), 1)
    LIBS += $(SDL2_LIBS)
    HAVE_SDL = 0
 endif
-endif
 
 ifeq ($(HAVE_OMAP), 1)
    OBJ += gfx/drivers/omap_gfx.o
@@ -867,8 +846,6 @@ endif
 
 # Record
 
-ifneq ($(C89_BUILD), 1)
-# ffmpeg and friends are not C89/C90-compliant APIs. 
 ifeq ($(HAVE_FFMPEG), 1)
    OBJ += record/drivers/record_ffmpeg.o \
 			 cores/ffmpeg_core.o
@@ -876,7 +853,6 @@ ifeq ($(HAVE_FFMPEG), 1)
    DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS)
 	DEFINES += -DHAVE_FFMPEG -Iffmpeg
 endif
-endif
 
 ifeq ($(HAVE_COMPRESSION), 1)
    DEFINES += -DHAVE_COMPRESSION
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 341c907fb3..587b8bcd2a 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -63,6 +63,6 @@ HAVE_7ZIP=yes           # Compile in 7z support
 HAVE_PRESERVE_DYLIB=no  # Disable dlclose() for Valgrind support
 HAVE_PARPORT=auto       # Parallel port joypad support
 HAVE_IMAGEVIEWER=yes    # Built-in image viewer support.
-C89_IMAGEVIEWER=no
+C89_IMAGEVIEWER=no      # stb_image hates C89
 HAVE_MMAP=auto          # MMAP support
 HAVE_QT=no              # QT companion support