diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-26 16:13:14 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-26 16:13:14 +0000 |
| commit | 6addebda62ab0c65c7f587b2fef7fb22c3340d41 (patch) | |
| tree | 6dbb771347101a91e208bdb02495871c2ab8f163 /code/qcommon/vm_x86.c | |
| parent | 9856ae6b514b8018c507586eb44900c52b5dcee2 (diff) | |
| download | ioquake3-aero-6addebda62ab0c65c7f587b2fef7fb22c3340d41.tar.gz ioquake3-aero-6addebda62ab0c65c7f587b2fef7fb22c3340d41.zip | |
* Fixed some long/int warnings, hopefully this doesn't disrupt the MSVC and/or 64bit builds
git-svn-id: svn://svn.icculus.org/quake3/trunk@112 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/qcommon/vm_x86.c')
| -rw-r--r-- | code/qcommon/vm_x86.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/code/qcommon/vm_x86.c b/code/qcommon/vm_x86.c index a86e667..4f7bca0 100644 --- a/code/qcommon/vm_x86.c +++ b/code/qcommon/vm_x86.c @@ -81,7 +81,7 @@ static int ftolPtr = (int)qftol0F7F; void doAsmCall( void ); static int asmCallPtr = (int)doAsmCall; -#endif // !_WIN32 +#endif static int callMask = 0; // bk001213 - init @@ -192,13 +192,13 @@ void callAsmCall(void) currentVM->programStack = callProgramStack - 4; *(int *)((byte *)currentVM->dataBase + callProgramStack + 4) = callSyscallNum; //VM_LogSyscalls((int *)((byte *)currentVM->dataBase + callProgramStack + 4) ); - *(callOpStack2+1) = currentVM->systemCall( (int *)((byte *)currentVM->dataBase + callProgramStack + 4) ); + *(callOpStack2+1) = currentVM->systemCall( (long *)((byte *)currentVM->dataBase + callProgramStack + 4) ); currentVM = savedVM; } // Note the C space function AsmCall is never actually called, and is in fact -// arbitarily named (though this is not true for the MSC version). When a vm +// arbitrarily named (though this is not true for the MSC version). When a vm // makes a system call, control jumps straight to the doAsmCall label. void AsmCall( void ) { asm( CMANG(doAsmCall) ": \n\t" \ @@ -1101,7 +1101,7 @@ This function is called directly by the generated code ============== */ #ifndef DLL_ONLY // bk010215 - for DLL_ONLY dedicated servers/builds w/o VM -int VM_CallCompiled( vm_t *vm, int *args ) { +int VM_CallCompiled( vm_t *vm, long *args ) { int stack[1024]; int programCounter; int programStack; |