try to avoid warning flood on android

diff --git a/jni/Android.mk b/jni/Android.mk
index 3e016ca..8444e1f 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -178,6 +178,9 @@ endif
   SOURCES_C   += $(DYNAREC_DIR)/emu_if.c
 
 ifeq ($(HAVE_LIGHTREC),1)
+  ifeq ($(findstring clang,$(notdir $(TARGET_CC))),clang)
+    COREFLAGS += -Wno-initializer-overrides
+  endif
   COREFLAGS   += -DLIGHTREC -DLIGHTREC_STATIC -DLIGHTREC_CODE_INV=0
   EXTRA_INCLUDES += $(DEPS_DIR)/lightning/include \
                    $(DEPS_DIR)/lightrec \

diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 845fc61..d181eb2 100644 (file)
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -80,7 +80,6 @@ typedef uint8_t boolean;
 #ifndef _WIN32
 #define strnicmp strncasecmp
 #endif
-#define __inline inline
 
 // Enables NLS/internationalization if active
 #ifdef ENABLE_NLS