unify non-psp synchronize(), fix a few sound issues

[gpsp.git] / common.h

diff --git a/common.h b/common.h
index 6b1cf95..f43d75c 100644 (file)
--- a/common.h
+++ b/common.h
@@ -29,6 +29,7 @@
 #ifdef _WIN32_WCE
   #include <windows.h>
 #else
+  #define _BSD_SOURCE // sync
   #include <stdlib.h>
   #include <stdio.h>
   #include <string.h>
@@ -114,8 +115,8 @@
   typedef signed char s8;
   typedef unsigned short int u16;
   typedef signed short int s16;
-  typedef unsigned long u32;
-  typedef signed long s32;
+  typedef unsigned int u32;
+  typedef signed int s32;
   typedef unsigned long long int u64;
   typedef signed long long int s64;
 
@@ -224,6 +225,9 @@ typedef u32 fixed16_16;
 #include "zip.h"
 #include "cheats.h"
 
+#ifdef ARM_ARCH
+  #include "arm/warm.h"
+#endif
 
 #ifdef PSP_BUILD
   #define printf pspDebugScreenPrintf