diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-10-07 16:44:42 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-10-07 16:44:42 +0000 |
| commit | c73ee1b920933964373d1ea3df89251a870fca74 (patch) | |
| tree | 50b3cdb85262fa8d4328805a078b0adcd00163f1 /plugins | |
| parent | 956e58158d94e343cbaa83abfc314daa94bdee12 (diff) | |
plug-ins: Quiet some 64-bit to 32-bit warnings on 64-bit OSes, specifically OS X.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@91796 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/bladesio1/connection.c | 4 | ||||
| -rwxr-xr-x | plugins/dfcdrom/cdr.c | 2 | ||||
| -rwxr-xr-x | plugins/dfnet/unix.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/bladesio1/connection.c b/plugins/bladesio1/connection.c index 17735032..1d4a075d 100755 --- a/plugins/bladesio1/connection.c +++ b/plugins/bladesio1/connection.c @@ -138,7 +138,7 @@ int connectionSend(u8 *pdata, s32 size) { int bytes = 0; if(clientsock >= 0) - if((bytes = send(clientsock, (const char*)pdata, size, 0)) < 0) + if((bytes = (int)send(clientsock, (const char*)pdata, size, 0)) < 0) return 0; return bytes; @@ -148,7 +148,7 @@ int connectionRecv(u8 *pdata, s32 size) { int bytes = 0; if(clientsock >= 0) - if((bytes = recv(clientsock, (char*)pdata, size, 0)) < 0) + if((bytes = (int)recv(clientsock, (char*)pdata, size, 0)) < 0) return 0; return bytes; diff --git a/plugins/dfcdrom/cdr.c b/plugins/dfcdrom/cdr.c index 6399e715..ecd0d9a4 100755 --- a/plugins/dfcdrom/cdr.c +++ b/plugins/dfcdrom/cdr.c @@ -278,7 +278,7 @@ void *CdrThread(void *arg) { PRINTF("reading %d:%d:%d\n", curTime[0], curTime[1], curTime[2]); - cdcache[i].ret = ReadSector((crdata *)&cdcache[i].cr); + cdcache[i].ret = (int)ReadSector((crdata *)&cdcache[i].cr); if (cdcache[i].ret == -1) break; PRINTF("readed %x:%x:%x\n", cdcache[i].cr.buf[12], cdcache[i].cr.buf[13], cdcache[i].cr.buf[14]); diff --git a/plugins/dfnet/unix.c b/plugins/dfnet/unix.c index b965bebc..840eb6a9 100755 --- a/plugins/dfnet/unix.c +++ b/plugins/dfnet/unix.c @@ -57,7 +57,7 @@ int sockPing() { RECV(data, 32, PSE_NET_BLOCKING); gettimeofday(&tvn, NULL); - return (tvn.tv_sec - tv.tv_sec) * 1000 + + return (int)(tvn.tv_sec - tv.tv_sec) * 1000 + (tvn.tv_usec - tv.tv_usec) / 1000; } |
