aboutsummaryrefslogtreecommitdiffstats
path: root/code/win32
diff options
context:
space:
mode:
authorludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-02-18 19:07:23 +0000
committerludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-02-18 19:07:23 +0000
commitc9d6b2beb19f80e43fec9aa61d80cc8a62233c33 (patch)
tree2f6ce39235e215b3905fe4c4f0f8651a6e6793df /code/win32
parente89fbb8fbef8c74d202565c100ff57b04f1a60dc (diff)
downloadioquake3-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/win32')
-rw-r--r--code/win32/win_main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/code/win32/win_main.c b/code/win32/win_main.c
index 9c97183..51d68b0 100644
--- a/code/win32/win_main.c
+++ b/code/win32/win_main.c
@@ -526,10 +526,10 @@ extern char *FS_BuildOSPath( const char *base, const char *game, const char *qp
// fqpath param added 7/20/02 by T.Ray - Sys_LoadDll is only called in vm.c at this time
// fqpath will be empty if dll not loaded, otherwise will hold fully qualified path of dll module loaded
// fqpath buffersize must be at least MAX_QPATH+1 bytes long
-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)(intptr_t, ...),
+ intptr_t (QDECL *systemcalls)(intptr_t, ...) ) {
HINSTANCE libHandle;
- void (QDECL *dllEntry)( long (QDECL *syscallptr)(long, ...) );
+ void (QDECL *dllEntry)( intptr_t (QDECL *syscallptr)(intptr_t, ...) );
char *basepath;
char *cdpath;
char *gamedir;
@@ -606,8 +606,8 @@ void * QDECL Sys_LoadDll( const char *name, char *fqpath , long (QDECL **entryPo
}
#endif
- dllEntry = ( void (QDECL *)(long (QDECL *)( long, ... ) ) )GetProcAddress( libHandle, "dllEntry" );
- *entryPoint = (long (QDECL *)(long,...))GetProcAddress( libHandle, "vmMain" );
+ dllEntry = ( void (QDECL *)(intptr_t (QDECL *)( intptr_t, ... ) ) )GetProcAddress( libHandle, "dllEntry" );
+ *entryPoint = (intptr_t (QDECL *)(intptr_t,...))GetProcAddress( libHandle, "vmMain" );
if ( !*entryPoint || !dllEntry ) {
FreeLibrary( libHandle );
return NULL;