diff options
| author | Tim Angus <tim@ngus.net> | 2006-02-24 22:04:35 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2006-02-24 22:04:35 +0000 |
| commit | e9456d7a58fc721cc5c931838399d9734b6fd971 (patch) | |
| tree | ece21f7411a55bb9bfec20a5e516d589726aa272 /src/game | |
| parent | 5c520de1c5d9fe71dadea68767535ce27add2dba (diff) | |
* Merged ioq3-r584
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/g_main.c | 8 | ||||
| -rw-r--r-- | src/game/g_syscalls.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c index a72d0459..06241b80 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -216,9 +216,9 @@ This is the only way control passes into the module. This must be the very first function compiled into the .q3vm file ================ */ -long vmMain( long command, long arg0, long arg1, long arg2, long arg3, long arg4, - long arg5, long arg6, long arg7, long arg8, long arg9, - long arg10, long arg11 ) +intptr_t vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, + int arg5, int arg6, int arg7, int arg8, int arg9, + int arg10, int arg11 ) { switch( command ) { @@ -231,7 +231,7 @@ long vmMain( long command, long arg0, long arg1, long arg2, long arg3, long arg4 return 0; case GAME_CLIENT_CONNECT: - return (long)ClientConnect( arg0, arg1, arg2 ); + return (intptr_t)ClientConnect( arg0, arg1, arg2 ); case GAME_CLIENT_THINK: ClientThink( arg0 ); diff --git a/src/game/g_syscalls.c b/src/game/g_syscalls.c index 4fe05c91..b6347441 100644 --- a/src/game/g_syscalls.c +++ b/src/game/g_syscalls.c @@ -26,10 +26,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // this file is only included when building a dll // g_syscalls.asm is included instead when building a qvm -static long (QDECL *syscall)( long arg, ... ) = (long (QDECL *)( long, ...))-1; +static intptr_t (QDECL *syscall)( intptr_t arg, ... ) = (intptr_t (QDECL *)( intptr_t, ...))-1; -void dllEntry( long (QDECL *syscallptr)( long arg,... ) ) +void dllEntry( intptr_t (QDECL *syscallptr)( intptr_t arg,... ) ) { syscall = syscallptr; } |