From c9d6b2beb19f80e43fec9aa61d80cc8a62233c33 Mon Sep 17 00:00:00 2001 From: ludwig Date: Sat, 18 Feb 2006 19:07:23 +0000 Subject: - 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 --- code/game/g_main.c | 4 ++-- code/game/g_syscalls.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'code/game') diff --git a/code/game/g_main.c b/code/game/g_main.c index a8819ff..62f3e86 100644 --- a/code/game/g_main.c +++ b/code/game/g_main.c @@ -200,7 +200,7 @@ 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 ) { case GAME_INIT: G_InitGame( arg0, arg1, arg2 ); @@ -209,7 +209,7 @@ long vmMain( long command, long arg0, long arg1, long arg2, long arg3, long arg4 G_ShutdownGame( arg0 ); 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 ); return 0; diff --git a/code/game/g_syscalls.c b/code/game/g_syscalls.c index 647cc06..d82be06 100644 --- a/code/game/g_syscalls.c +++ b/code/game/g_syscalls.c @@ -28,10 +28,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #error "Do not use in VM build" #endif -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; } -- cgit v1.2.3