(Android) Fixes

Makefile

@@ -19,7 +19,6 @@ endif
 # If you have a system with 1GB RAM or more - cache the whole 
 # CD for CD-based systems in order to prevent file access delays/hiccups
 CACHE_CD = 0
-NEED_TRIO = 1
 
 #if no core specified, just pick psx for now
 ifeq ($(core),)
@@ -434,13 +433,8 @@ MEDNAFEN_SOURCES := $(MEDNAFEN_DIR)/mednafen.cpp \
 
 LIBRETRO_SOURCES := libretro.cpp stubs.cpp $(THREAD_STUBS)
 
-ifeq ($(NEED_TRIO), 1)
 TRIO_SOURCES += $(MEDNAFEN_DIR)/trio/trio.c \
-	$(MEDNAFEN_DIR)/trio/trionan.c \
 	$(MEDNAFEN_DIR)/trio/triostr.c
-else
-TRIO_SOURCES += libretro_trio.c
-endif
 
 SOURCES_C := 	$(TREMOR_SRC) $(LIBRETRO_SOURCES_C) $(TRIO_SOURCES)
 

jni/Android.mk

@@ -26,7 +26,6 @@ LOCAL_MODULE    := libretro
 # If you have a system with 1GB RAM or more - cache the whole 
 # CD for CD-based systems in order to prevent file access delays/hiccups
 CACHE_CD = 0
-NEED_TRIO = 1
 
 #if no core specified, just pick psx for now
 ifeq ($(core),)
@@ -361,17 +360,12 @@ MEDNAFEN_SOURCES := $(MEDNAFEN_DIR)/mednafen.cpp \
 
 LIBRETRO_SOURCES := $(MEDNAFEN_LIBRETRO_DIR)/libretro.cpp $(MEDNAFEN_LIBRETRO_DIR)/stubs.cpp $(THREAD_STUBS)
 
-ifeq ($(NEED_TRIO), 1)
 TRIO_SOURCES += $(MEDNAFEN_DIR)/trio/trio.c \
-	$(MEDNAFEN_DIR)/trio/trionan.c \
 	$(MEDNAFEN_DIR)/trio/triostr.c
-else
-TRIO_SOURCES += libretro_trio.c
-endif
 
 SOURCES_C := 	$(TREMOR_SRC) $(LIBRETRO_SOURCES_C) $(TRIO_SOURCES)
 
-LOCAL_SRC_FILES += $(LIBRETRO_SOURCES) $(CORE_SOURCES) $(MEDNAFEN_SOURCES) $(HW_CPU_SOURCES) $(HW_MISC_SOURCES) $(HW_SOUND_SOURCES) $(HW_VIDEO_SOURCES)
+LOCAL_SRC_FILES += $(LIBRETRO_SOURCES) $(CORE_SOURCES) $(MEDNAFEN_SOURCES) $(HW_CPU_SOURCES) $(HW_MISC_SOURCES) $(HW_SOUND_SOURCES) $(HW_VIDEO_SOURCES) $(SOURCES_C)
 
 WARNINGS := -Wall \
 	-Wno-sign-compare \

libretro_trio.c

@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-int trio_sscanf(const char *buffer, const char *format, ...)
-{
-   return sscanf(buffer, format);
-}
-
-int trio_snprintf(const char *buffer, size_t max, const char *format, ...)
-{
-   return snprintf(buffer, max, format);
-}
-
-int trio_fprintf(FILE *file, const char *format, ...)
-{
-   return fprintf(file, format);
-}
-
-int trio_vasprintf(char **result, const char *format, va_list args)
-{
-   return vasprintf(result, format, args);
-}
-
-int trio_vfprintf(FILE *file, const char *format, va_list args)
-{
-   return vfprintf(file, format, args);
-}
-
-int trio_vfscanf(FILE *file, const char *format, va_list args)
-{
-   return vfscanf(file, format, args);
-}

mednafen/FileStream.cpp

@@ -17,14 +17,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <sys/stat.h>
 #include "mednafen.h"
 #include "Stream.h"
 #include "FileStream.h"
 
 #include <trio/trio.h>
 #include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <string.h>
 
 #ifdef __CELLOS_LV2__

mednafen/FileWrapper.cpp

@@ -15,12 +15,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <sys/stat.h>
 #include "mednafen.h"
 #include "FileWrapper.h"
 
 #include <trio/trio.h>
 #include <stdarg.h>
-#include <sys/stat.h>
 #include <string.h>
 
 #ifdef __CELLOS_LV2__

mednafen/FileWrapper.h

@@ -1,9 +1,6 @@
 #ifndef __MDFN_FILEWRAPPER_H
 #define __MDFN_FILEWRAPPER_H
 
-#include <stdio.h>
-#include <string>
-
 // A stdio FILE wrapper(with some BSD and POSIXisms, and a little dash of Win32, thrown in for special behaviors)
 class FileWrapper
 {

mednafen/cdrom/CDAccess.cpp

@@ -15,11 +15,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "../mednafen.h"
-
-#include <sys/types.h>
 #include <sys/stat.h>
-
+#include "../mednafen.h"
 
 #include "CDAccess.h"
 #include "CDAccess_Image.h"

mednafen/cdrom/CDAccess_Image.cpp

@@ -31,10 +31,8 @@
 */
 
 #define _CDROMFILE_INTERNAL
-#include "../mednafen.h"
-
-#include <sys/types.h>
 #include <sys/stat.h>
+#include "../mednafen.h"
 
 #include <string.h>
 #include <errno.h>
@@ -622,6 +620,7 @@ void CDAccess_Image::ImageOpen(const char *path, bool image_memcache)
 
  int32 RunningLBA = 0;
  int32 LastIndex = 0;
+ (void)LastIndex;
  long FileOffset = 0;
 
  for(int x = FirstTrack; x < (FirstTrack + NumTracks); x++)

mednafen/cdrom/CDUtility.cpp

@@ -17,9 +17,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "dvdisaster.h"
 #include "../mednafen.h"
 #include "CDUtility.h"
-#include "dvdisaster.h"
 #include "lec.h"
 
 namespace CDUtility

mednafen/cdrom/audioreader.cpp

@@ -21,12 +21,10 @@
 // Don't allow exceptions to propagate into the vorbis/musepack/etc. libraries, as it could easily leave the state of the library's decoder "object" in an
 // inconsistent state, which would cause all sorts of unfun when we try to destroy it while handling the exception farther up.
 
+#include <sys/stat.h>
 #include "../mednafen.h"
 #include "audioreader.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include "../tremor/ivorbisfile.h"
 
 #include <string.h>

mednafen/cdrom/dvdisaster.h

@@ -35,14 +35,13 @@
  *** Everything #includeable is rolled up herein...
  */
 
+#include <sys/stat.h>
 #include "../mednafen-types.h"
 
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <math.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>

mednafen/cdrom/lec.cpp

@@ -17,12 +17,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <assert.h>
-#include <sys/types.h>
 
 #include "lec.h"
 

mednafen/mednafen-types.h

@@ -1,17 +1,6 @@
 #ifndef __MDFN_TYPES
 #define __MDFN_TYPES
 
-// Make sure this file is included BEFORE a few common standard C header files(stdio.h, errno.h, math.h, AND OTHERS, but this is not an exhaustive check, nor
-// should it be), so that any defines in config.h that change header file behavior will work properly.
-#if defined(EOF) || defined(EACCES) || defined(F_LOCK) || defined(NULL) || defined(O_APPEND) || defined(M_LOG2E)
- #error "Wrong include order for mednafen-types.h"
-#endif
-
-// Yes, yes, I know:  There's a better place for including config.h than here, but I'm tired, and this should work fine. :b
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <assert.h>
 #include <stdint.h>
 
@@ -25,11 +14,6 @@ typedef uint16_t uint16;
 typedef uint32_t uint32;
 typedef uint64_t uint64;
 
-
-#if !defined(HAVE_NATIVE64BIT) && SIZEOF_VOID_P >= 8
-#define HAVE_NATIVE64BIT 1
-#endif
-
 #ifdef __GNUC__
 
   #define INLINE inline __attribute__((always_inline))

mednafen/psx/gte.cpp

@@ -1020,6 +1020,7 @@ INLINE void MultiplyMatrixByVector_PT(const gtematrix *matrix, const int16 *v, c
  const int32* cv = CRVectors.All[(instr >> 13) & 0x3];	\
  const int lm = (instr >> 10) & 1;			\
  int16 v[3];							\
+ (void)v; \
  if(v_i == 3)							\
  {								\
   v[0] = IR1;							\

mednafen/trio/trio.c

@@ -126,7 +126,7 @@
 #endif
 
 #if defined(__STDC_ISO_10646__) || defined(MB_LEN_MAX) || defined(USE_MULTIBYTE) || TRIO_FEATURE_WIDECHAR
-# if !defined(TRIO_PLATFORM_WINCE)
+# if !defined(TRIO_PLATFORM_WINCE) && !defined(ANDROID)
 #  define TRIO_COMPILER_SUPPORTS_MULTIBYTE
 #  if !defined(MB_LEN_MAX)
 #   define MB_LEN_MAX 6