workaround a problem with the harmattan gcc

[drnoksnes] / port.h

diff --git a/port.h b/port.h
index b81e6ef..5ffb924 100644 (file)
--- a/port.h
+++ b/port.h
@@ -73,14 +73,6 @@ typedef int16_t                      int16;
 typedef int32_t                        int32;
 typedef int64_t                        int64;
 
-//For Debugging Purposes:
-
-typedef uint8_t                        bool8_32;
-typedef uint8_t                        uint8_32;
-typedef uint16_t               uint16_32;
-typedef int8_t                 int8_32;
-typedef int16_t                        int16_32;
-
 //Defines for Extern C
 #ifdef __cplusplus
 #define EXTERN_C extern "C"
@@ -99,9 +91,13 @@ typedef int16_t                      int16_32;
 #define _MAX_EXT NAME_MAX
 #define _MAX_PATH PATH_MAX
 
-//True/False Defines
+// Boolean constants (may already be defined)
+#ifndef TRUE
 #define TRUE 1
+#endif
+#ifndef FALSE
 #define FALSE 0
+#endif
 
 // Config -> Defines
 #if CONF_BUILD_ASM_SPC700
@@ -112,10 +108,12 @@ typedef int16_t                   int16_32;
 
 // Configuration defines I think I know what they're for
 #define SUPER_FX               1
+#define USE_SA1                        1
 #define CPU_SHUTDOWN   1
 //#define NETPLAY_SUPPORT      1
 #define ZLIB                   1
 #define UNZIP_SUPPORT  1
+#define NO_INLINE_SET_GET 1
 
 //Misc Items
 #define VAR_CYCLES
@@ -143,6 +141,13 @@ void PathSplit(const char *path, char *drive, char *dir, char *fname, char *ext)
 const char * PathBasename(const char * path);
 END_EXTERN_C
 
+// Input / output functions
+START_EXTERN_C
+uint32 S9xReadJoypad(int which1_0_to_4);
+bool8 S9xReadMousePosition(int which1_0_to_1, int *x, int *y, uint32 *buttons);
+bool8 S9xReadSuperScopePosition(int *x, int *y, uint32 *buttons);
+END_EXTERN_C
+
 // Stream functions, used when opening ROMs and snapshots.
 #ifdef ZLIB
 #include <zlib.h>