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/cgame | |
parent | 5c520de1c5d9fe71dadea68767535ce27add2dba (diff) |
* Merged ioq3-r584
Diffstat (limited to 'src/cgame')
-rw-r--r-- | src/cgame/cg_main.c | 6 | ||||
-rw-r--r-- | src/cgame/cg_syscalls.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 5963d0bf..d5903ce7 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -43,9 +43,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 ) { diff --git a/src/cgame/cg_syscalls.c b/src/cgame/cg_syscalls.c index 1d982734..5c7ac16d 100644 --- a/src/cgame/cg_syscalls.c +++ b/src/cgame/cg_syscalls.c @@ -27,10 +27,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "cg_local.h" -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; } |