From e6162687c15ff28610c641498e86037ffb019089 Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Fri, 26 Sep 2008 15:06:51 +0000 Subject: [PATCH] One more inline hint and (hopefully) fixed Linux (again :p) git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@151 a6443dda-0b58-4228-96e9-037be469359c --- pcsx2/PS2Etypes.h | 1 + pcsx2/R5900.c | 2 +- pcsx2/Sif.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pcsx2/PS2Etypes.h b/pcsx2/PS2Etypes.h index 07dc0f45a2..ea28c96fc7 100644 --- a/pcsx2/PS2Etypes.h +++ b/pcsx2/PS2Etypes.h @@ -20,6 +20,7 @@ #if defined (__linux__) && !defined(__LINUX__) // some distributions are lower case #define __LINUX__ +#define _inline __inline__ #endif #ifdef __CYGWIN__ diff --git a/pcsx2/R5900.c b/pcsx2/R5900.c index f2e31f3e1b..9d43288fd7 100644 --- a/pcsx2/R5900.c +++ b/pcsx2/R5900.c @@ -362,7 +362,7 @@ void _cpuTestInterrupts() { u32 s_iLastCOP0Cycle = 0; u32 s_iLastPERFCycle[2] = {0,0}; -static void _cpuTestTIMR() { +_inline static void _cpuTestTIMR() { cpuRegs.CP0.n.Count += cpuRegs.cycle-s_iLastCOP0Cycle; s_iLastCOP0Cycle = cpuRegs.cycle; diff --git a/pcsx2/Sif.h b/pcsx2/Sif.h index 16777e992f..b6918e2825 100644 --- a/pcsx2/Sif.h +++ b/pcsx2/Sif.h @@ -45,7 +45,7 @@ extern void sif0Interrupt(); extern void EEsif1Interrupt(); extern void EEsif0Interrupt(); extern int EEsif2Interrupt(); -extern int sifFreeze(gzFile f, int Mode); +int sifFreeze(gzFile f, int Mode); #endif /* __SIF_H__ */