diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-22 03:21:33 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-09-22 03:21:33 +0000 |
| commit | df30c9d13185a525d2c45de3becd39c4a178f484 (patch) | |
| tree | 3cf10550bfe1d9473252bfc3ad56b8007652e622 /code/win32/win_main.c | |
| parent | 3873056dc5e0a7c314fa42dd70c072027ccccec0 (diff) | |
| download | ioquake3-aero-df30c9d13185a525d2c45de3becd39c4a178f484.tar.gz ioquake3-aero-df30c9d13185a525d2c45de3becd39c4a178f484.zip | |
* Port to MinGW
git-svn-id: svn://svn.icculus.org/quake3/trunk@97 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/win32/win_main.c')
| -rw-r--r-- | code/win32/win_main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/code/win32/win_main.c b/code/win32/win_main.c index ff079e5..a66f712 100644 --- a/code/win32/win_main.c +++ b/code/win32/win_main.c @@ -56,7 +56,7 @@ void Spk_Open(char *name) fh = open( name, O_TRUNC | O_CREAT | O_WRONLY, S_IREAD | S_IWRITE ); }; -void Spk_Close() +void Spk_Close(void) { if (!fh) return; @@ -526,7 +526,7 @@ 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 , int (QDECL **entryPoint)(int, ...), +void * QDECL Sys_LoadDll( const char *name, char *fqpath , long (QDECL **entryPoint)(long, ...), long (QDECL *systemcalls)(long, ...) ) { static int lastWarning = 0; HINSTANCE libHandle; @@ -1100,7 +1100,11 @@ void Sys_Init( void ) { { Com_Printf( "...detecting CPU, found " ); +#ifndef __MINGW32__ cpuid = Sys_GetProcessorId(); +#else // See comments in win_shared.c + cpuid = CPUID_GENERIC; +#endif switch ( cpuid ) { |