From 8bca7a2d9797c2b0546895f5e62fc05b38183468 Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Sat, 31 Jul 2010 12:31:11 +0000 Subject: dfinput (macosx): upgraded to SDL 1.3 Beta. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@55318 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfinput/pad.h | 1 + plugins/dfsound/spu.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h index 80dd5b0e..8347caf8 100644 --- a/plugins/dfinput/pad.h +++ b/plugins/dfinput/pad.h @@ -35,6 +35,7 @@ extern "C" { #include #include +#include #ifdef _MACOSX #include diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index 15c30a45..c086c06b 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -90,7 +90,7 @@ int bThreadEnded=0; int bSpuInit=0; int bSPUIsOpen=0; -static pthread_t thread = -1; // thread id (linux) +static pthread_t thread = (pthread_t)-1; // thread id (linux) unsigned long dwNewChannel=0; // flags for faster testing, if new channel starts @@ -841,7 +841,7 @@ void RemoveTimer(void) { int i=0; while(!bThreadEnded && i<2000) {usleep(1000L);i++;} // -> wait until thread has ended - if(thread!=-1) {pthread_cancel(thread);thread=-1;} // -> cancel thread anyway + if(thread!=(pthread_t)-1) {pthread_cancel(thread);thread=(pthread_t)-1;} // -> cancel thread anyway } bThreadEnded=0; // no more spu is running -- cgit v1.2.3