From 9e109e16d935733d9fa63eb71f7446ca138e0469 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Sat, 21 Dec 2013 13:05:51 +0100
Subject: [PATCH] Android buildfix.

Also, this warning flag appears not supported. (4.6?)
---
 Core/Reporting.cpp     | 2 +-
 GPU/GLES/Framebuffer.h | 3 +++
 android/jni/Android.mk | 2 +-
 android/jni/Locals.mk  | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp
index 858d56c04f..27228070ba 100644
--- a/Core/Reporting.cpp
+++ b/Core/Reporting.cpp
@@ -239,7 +239,7 @@ namespace Reporting
 	{
 		// Disabled when using certain hacks, because they make for poor reports.
 		// TODO: Numbers to avoid dependency on GLES code.
-		if (g_Config.iRenderingMode >= FB_READFBOMEMORY_CPU)
+		if (g_Config.iRenderingMode >= FBO_READFBOMEMORY_MIN)
 			return false;
 		return true;
 	}
diff --git a/GPU/GLES/Framebuffer.h b/GPU/GLES/Framebuffer.h
index b118d272e0..f36a17bc61 100644
--- a/GPU/GLES/Framebuffer.h
+++ b/GPU/GLES/Framebuffer.h
@@ -41,12 +41,15 @@ enum {
 enum {
 	FB_NON_BUFFERED_MODE = 0,
 	FB_BUFFERED_MODE = 1,
+
+	// Hm, it's unfortunate that GPU has ended up as two separate values in GL and GLES.
 #ifndef USING_GLES2
 	FB_READFBOMEMORY_CPU = 2,
 	FB_READFBOMEMORY_GPU = 3,
 #else
 	FB_READFBOMEMORY_GPU = 2,
 #endif
+	FBO_READFBOMEMORY_MIN = 2
 };
 
 struct VirtualFramebuffer {
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 090907bd33..a2d2a43e8d 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := native_audio
-LOCAL_CFLAGS := -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-literal-suffix -D__STDC_CONSTANT_MACROS
+LOCAL_CFLAGS := -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -D__STDC_CONSTANT_MACROS
 # yes, it's really CPPFLAGS for C++
 LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti
 NATIVE := ../../native
diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index 5a35dfd7d4..e4ad2d1cde 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -3,7 +3,7 @@
 
 LOCAL_CFLAGS := -DUSE_FFMPEG -DUSING_GLES2 -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS
 # yes, it's really CPPFLAGS for C++
-LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -Wno-literal-suffix
+LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder
 LOCAL_C_INCLUDES := \
   $(LOCAL_PATH)/../../Common \
   $(LOCAL_PATH)/../.. \