diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-07-31 12:31:11 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-07-31 12:31:11 +0000 |
| commit | 8bca7a2d9797c2b0546895f5e62fc05b38183468 (patch) | |
| tree | 19e6bad8d1c3eabaaa7e34fe425a702ef7eb1e2b /plugins | |
| parent | dd4c0b039bcd38459cd5545d087c2b047198067b (diff) | |
| download | pcsxr-8bca7a2d9797c2b0546895f5e62fc05b38183468.tar.gz | |
dfinput (macosx): upgraded to SDL 1.3 Beta.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@55318 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfinput/pad.h | 1 | ||||
| -rw-r--r-- | plugins/dfsound/spu.c | 4 |
2 files changed, 3 insertions, 2 deletions
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 <pthread.h> #include <SDL.h> +#include <SDL_joystick.h> #ifdef _MACOSX #include <Carbon/Carbon.h> 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 |