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/qcommon.h | |
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/qcommon.h')
-rw-r--r-- | code/qcommon/qcommon.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h index 21c74e9..5de428f 100644 --- a/code/qcommon/qcommon.h +++ b/code/qcommon/qcommon.h @@ -317,7 +317,7 @@ typedef enum { } sharedTraps_t; void VM_Init( void ); -vm_t *VM_Create( const char *module, long (*systemCalls)(long *), +vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *), vmInterpret_t interpret ); // module should be bare: "cgame", not "cgame.dll" or "vm/cgame.qvm" @@ -325,18 +325,18 @@ void VM_Free( vm_t *vm ); void VM_Clear(void); vm_t *VM_Restart( vm_t *vm ); -long QDECL VM_Call( vm_t *vm, long callNum, ... ); +intptr_t QDECL VM_Call( vm_t *vm, int callNum, ... ); void VM_Debug( int level ); -void *VM_ArgPtr( long intValue ); -void *VM_ExplicitArgPtr( vm_t *vm, long intValue ); +void *VM_ArgPtr( intptr_t intValue ); +void *VM_ExplicitArgPtr( vm_t *vm, intptr_t intValue ); #define VMA(x) VM_ArgPtr(args[x]) -static ID_INLINE float _vmf(long x) +static ID_INLINE float _vmf(intptr_t x) { union { - long l; + intptr_t l; float f; } t; t.l = x; @@ -963,8 +963,8 @@ void Sys_Init (void); // general development dll loading for virtual machine testing // fqpath param added 7/20/02 by T.Ray - Sys_LoadDll is only called in vm.c at this time -void * QDECL Sys_LoadDll( const char *name, char *fqpath , long (QDECL **entryPoint)(long, ...), - long (QDECL *systemcalls)(long, ...) ); +void * QDECL Sys_LoadDll( const char *name, char *fqpath , intptr_t (QDECL **entryPoint)(int, ...), + intptr_t (QDECL *systemcalls)(intptr_t, ...) ); void Sys_UnloadDll( void *dllHandle ); void Sys_UnloadGame( void ); |