diff options
Diffstat (limited to 'code/unix')
-rw-r--r-- | code/unix/linux_qgl.c | 22 | ||||
-rw-r--r-- | code/unix/sdl_glimp.c | 4 | ||||
-rw-r--r-- | code/unix/sdl_snd.c | 6 | ||||
-rw-r--r-- | code/unix/unix_shared.c | 6 |
4 files changed, 19 insertions, 19 deletions
diff --git a/code/unix/linux_qgl.c b/code/unix/linux_qgl.c index b509c0e..b38edbc 100644 --- a/code/unix/linux_qgl.c +++ b/code/unix/linux_qgl.c @@ -3407,17 +3407,17 @@ qboolean QGL_Init( const char *dllname ) qglXCopyContext = GPA("glXCopyContext"); qglXSwapBuffers = GPA("glXSwapBuffers"); - qglLockArraysEXT = 0; - qglUnlockArraysEXT = 0; - qglPointParameterfEXT = 0; - qglPointParameterfvEXT = 0; - qglColorTableEXT = 0; - qgl3DfxSetPaletteEXT = 0; - qglSelectTextureSGIS = 0; - qglMTexCoord2fSGIS = 0; - qglActiveTextureARB = 0; - qglClientActiveTextureARB = 0; - qglMultiTexCoord2fARB = 0; + qglLockArraysEXT = NULL; + qglUnlockArraysEXT = NULL; + qglPointParameterfEXT = NULL; + qglPointParameterfvEXT = NULL; + qglColorTableEXT = NULL; + qgl3DfxSetPaletteEXT = NULL; + qglSelectTextureSGIS = NULL; + qglMTexCoord2fSGIS = NULL; + qglActiveTextureARB = NULL; + qglClientActiveTextureARB = NULL; + qglMultiTexCoord2fARB = NULL; return qtrue; } diff --git a/code/unix/sdl_glimp.c b/code/unix/sdl_glimp.c index c20f394..2724811 100644 --- a/code/unix/sdl_glimp.c +++ b/code/unix/sdl_glimp.c @@ -1316,13 +1316,13 @@ void IN_StartupJoystick( void ) if (!SDL_WasInit(SDL_INIT_JOYSTICK)) { - Com_Printf( PRINT_ALL, "Calling SDL_Init(SDL_INIT_JOYSTICK)...\n"); + Com_Printf("Calling SDL_Init(SDL_INIT_JOYSTICK)...\n"); if (SDL_Init(SDL_INIT_JOYSTICK) == -1) { Com_Printf("SDL_Init(SDL_INIT_JOYSTICK) failed: %s\n", SDL_GetError()); return; } - Com_Printf( PRINT_ALL, "SDL_Init(SDL_INIT_JOYSTICK) passed.\n"); + Com_Printf("SDL_Init(SDL_INIT_JOYSTICK) passed.\n"); } total = SDL_NumJoysticks(); diff --git a/code/unix/sdl_snd.c b/code/unix/sdl_snd.c index 0c28316..39fc933 100644 --- a/code/unix/sdl_snd.c +++ b/code/unix/sdl_snd.c @@ -169,13 +169,13 @@ qboolean SNDDMA_Init(void) if (!SDL_WasInit(SDL_INIT_AUDIO)) { - Com_Printf( PRINT_ALL, "Calling SDL_Init(SDL_INIT_AUDIO)...\n"); + Com_Printf("Calling SDL_Init(SDL_INIT_AUDIO)...\n"); if (SDL_Init(SDL_INIT_AUDIO) == -1) { - Com_Printf( PRINT_ALL, "SDL_Init(SDL_INIT_AUDIO) failed: %s\n", SDL_GetError()); + Com_Printf("SDL_Init(SDL_INIT_AUDIO) failed: %s\n", SDL_GetError()); return qfalse; } - Com_Printf( PRINT_ALL, "SDL_Init(SDL_INIT_AUDIO) passed.\n"); + Com_Printf("SDL_Init(SDL_INIT_AUDIO) passed.\n"); } if (SDL_AudioDriverName(drivername, sizeof (drivername)) == NULL) diff --git a/code/unix/unix_shared.c b/code/unix/unix_shared.c index beb69c4..e3d0dad 100644 --- a/code/unix/unix_shared.c +++ b/code/unix/unix_shared.c @@ -253,7 +253,7 @@ char **Sys_ListFiles( const char *directory, const char *extension, char *filter nfiles = 0; Sys_ListFilteredFiles( directory, "", filter, list, &nfiles ); - list[ nfiles ] = 0; + list[ nfiles ] = NULL; *numfiles = nfiles; if (!nfiles) @@ -309,7 +309,7 @@ char **Sys_ListFiles( const char *directory, const char *extension, char *filter nfiles++; } - list[ nfiles ] = 0; + list[ nfiles ] = NULL; closedir(fdir); @@ -428,7 +428,7 @@ char *Sys_GetCurrentUser( void ) #if defined(__linux__) // TTimo // sysconf() in libc, POSIX.1 compliant -unsigned int Sys_ProcessorCount() +unsigned int Sys_ProcessorCount(void) { return sysconf(_SC_NPROCESSORS_ONLN); } |