diff options
author | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-02-18 19:07:23 +0000 |
---|---|---|
committer | ludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-02-18 19:07:23 +0000 |
commit | c9d6b2beb19f80e43fec9aa61d80cc8a62233c33 (patch) | |
tree | 2f6ce39235e215b3905fe4c4f0f8651a6e6793df /code/qcommon/vm_interpreted.c | |
parent | e89fbb8fbef8c74d202565c100ff57b04f1a60dc (diff) | |
download | ioquake3-aero-c9d6b2beb19f80e43fec9aa61d80cc8a62233c33.tar.gz ioquake3-aero-c9d6b2beb19f80e43fec9aa61d80cc8a62233c33.zip |
- change long to intptr_t for 64bit windows compatability
- change vmMain arguments back to int. 64bit types are apparently not
needed there. Only the syscall function needs them.
git-svn-id: svn://svn.icculus.org/quake3/trunk@550 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/qcommon/vm_interpreted.c')
-rw-r--r-- | code/qcommon/vm_interpreted.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/code/qcommon/vm_interpreted.c b/code/qcommon/vm_interpreted.c index 4a9ff5b..12fcfae 100644 --- a/code/qcommon/vm_interpreted.c +++ b/code/qcommon/vm_interpreted.c @@ -493,7 +493,7 @@ nextInstruction2: src = (int *)&image[ r0&dataMask ]; dest = (int *)&image[ r1&dataMask ]; - if ( ( (long)src | (long)dest | count ) & 3 ) { + if ( ( (intptr_t)src | (intptr_t)dest | count ) & 3 ) { // happens in westernq3 Com_Printf( S_COLOR_YELLOW "Warning: OP_BLOCK_COPY not dword aligned\n"); } @@ -534,16 +534,16 @@ nextInstruction2: //VM_LogSyscalls( (int *)&image[ programStack + 4 ] ); { - long* argptr = (long *)&image[ programStack + 4 ]; + intptr_t* argptr = (intptr_t *)&image[ programStack + 4 ]; #if __WORDSIZE == 64 // the vm has ints on the stack, we expect // longs so we have to convert it - long argarr[16]; + intptr_t argarr[16]; int i; for (i = 0; i < 16; ++i) { argarr[i] = *(int*)&image[ programStack + 4 + 4*i ]; - argptr = argarr; } + argptr = argarr; #endif r = vm->systemCall( argptr ); } |