diff options
Diffstat (limited to 'code/client')
-rw-r--r-- | code/client/cl_curl.c | 8 | ||||
-rw-r--r-- | code/client/cl_curl.h | 4 | ||||
-rw-r--r-- | code/client/cl_main.c | 10 | ||||
-rw-r--r-- | code/client/client.h | 2 | ||||
-rw-r--r-- | code/client/qal.c | 4 | ||||
-rw-r--r-- | code/client/qal.h | 6 | ||||
-rw-r--r-- | code/client/snd_codec.c | 2 | ||||
-rw-r--r-- | code/client/snd_codec_ogg.c | 2 | ||||
-rw-r--r-- | code/client/snd_openal.c | 4 |
9 files changed, 21 insertions, 21 deletions
diff --git a/code/client/cl_curl.c b/code/client/cl_curl.c index e4527df..e4db3eb 100644 --- a/code/client/cl_curl.c +++ b/code/client/cl_curl.c @@ -20,11 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#if USE_CURL +#ifdef USE_CURL #include "client.h" cvar_t *cl_cURLLib; -#if USE_CURL_DLOPEN +#ifdef USE_CURL_DLOPEN #include "../sys/sys_loadlib.h" char* (*qcurl_version)(void); @@ -88,7 +88,7 @@ CL_cURL_Init */ qboolean CL_cURL_Init() { -#if USE_CURL_DLOPEN +#ifdef USE_CURL_DLOPEN if(cURLLib) return qtrue; @@ -156,7 +156,7 @@ CL_cURL_Shutdown void CL_cURL_Shutdown( void ) { CL_cURL_Cleanup(); -#if USE_CURL_DLOPEN +#ifdef USE_CURL_DLOPEN if(cURLLib) { Sys_UnloadLibrary(cURLLib); diff --git a/code/client/cl_curl.h b/code/client/cl_curl.h index 57ed216..1cfd3f1 100644 --- a/code/client/cl_curl.h +++ b/code/client/cl_curl.h @@ -37,14 +37,14 @@ extern cvar_t *cl_cURLLib; #define DEFAULT_CURL_LIB "libcurl.so.3" #endif -#if USE_LOCAL_HEADERS +#ifdef USE_LOCAL_HEADERS #include "../libcurl/curl/curl.h" #else #include <curl/curl.h> #endif -#if USE_CURL_DLOPEN +#ifdef USE_CURL_DLOPEN extern char* (*qcurl_version)(void); extern CURL* (*qcurl_easy_init)(void); diff --git a/code/client/cl_main.c b/code/client/cl_main.c index fb830ef..146c234 100644 --- a/code/client/cl_main.c +++ b/code/client/cl_main.c @@ -689,7 +689,7 @@ CL_ShutdownAll */ void CL_ShutdownAll(void) { -#if USE_CURL +#ifdef USE_CURL CL_cURL_Shutdown(); #endif // clear sounds @@ -1451,7 +1451,7 @@ Called when all downloading has been completed */ void CL_DownloadsComplete( void ) { -#if USE_CURL +#ifdef USE_CURL // if we downloaded with cURL if(clc.cURLUsed) { clc.cURLUsed = qfalse; @@ -1579,7 +1579,7 @@ void CL_NextDownload(void) { *s++ = 0; else s = localName + strlen(localName); // point at the nul byte -#if USE_CURL +#ifdef USE_CURL if(!(cl_allowDownload->integer & DLF_NO_REDIRECT)) { if(clc.sv_allowDownload & DLF_NO_REDIRECT) { Com_Printf("WARNING: server does not " @@ -2205,7 +2205,7 @@ void CL_Frame ( int msec ) { return; } -#if USE_CURL +#ifdef USE_CURL if(clc.downloadCURLM) { CL_cURL_PerformDownload(); // we can't process frames normally when in disconnected @@ -2698,7 +2698,7 @@ void CL_Init( void ) { cl_showMouseRate = Cvar_Get ("cl_showmouserate", "0", 0); cl_allowDownload = Cvar_Get ("cl_allowDownload", "0", CVAR_ARCHIVE); -#if USE_CURL +#ifdef USE_CURL cl_cURLLib = Cvar_Get("cl_cURLLib", DEFAULT_CURL_LIB, CVAR_ARCHIVE); #endif diff --git a/code/client/client.h b/code/client/client.h index d419bd1..936f906 100644 --- a/code/client/client.h +++ b/code/client/client.h @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../cgame/cg_public.h" #include "../game/bg_public.h" -#if USE_CURL +#ifdef USE_CURL #include "cl_curl.h" #endif /* USE_CURL */ diff --git a/code/client/qal.c b/code/client/qal.c index b573a3b..66b7f03 100644 --- a/code/client/qal.c +++ b/code/client/qal.c @@ -23,11 +23,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // Dynamically loads OpenAL -#if USE_OPENAL +#ifdef USE_OPENAL #include "qal.h" -#if USE_OPENAL_DLOPEN +#ifdef USE_OPENAL_DLOPEN #include "../sys/sys_loadlib.h" diff --git a/code/client/qal.h b/code/client/qal.h index b0f778c..1a2284a 100644 --- a/code/client/qal.h +++ b/code/client/qal.h @@ -28,12 +28,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" #include "../qcommon/qcommon.h" -#if USE_OPENAL_DLOPEN +#ifdef USE_OPENAL_DLOPEN #define AL_NO_PROTOTYPES #define ALC_NO_PROTOTYPES #endif -#if USE_LOCAL_HEADERS +#ifdef USE_LOCAL_HEADERS #include "../AL/al.h" #include "../AL/alc.h" #else @@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #endif -#if USE_OPENAL_DLOPEN +#ifdef USE_OPENAL_DLOPEN extern LPALENABLE qalEnable; extern LPALDISABLE qalDisable; extern LPALISENABLED qalIsEnabled; diff --git a/code/client/snd_codec.c b/code/client/snd_codec.c index 1c1a42a..52435c1 100644 --- a/code/client/snd_codec.c +++ b/code/client/snd_codec.c @@ -102,7 +102,7 @@ void S_CodecInit() { codecs = NULL; S_CodecRegister(&wav_codec); -#if USE_CODEC_VORBIS +#ifdef USE_CODEC_VORBIS S_CodecRegister(&ogg_codec); #endif } diff --git a/code/client/snd_codec_ogg.c b/code/client/snd_codec_ogg.c index 72ece94..3ea703a 100644 --- a/code/client/snd_codec_ogg.c +++ b/code/client/snd_codec_ogg.c @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ // OGG support is enabled by this define -#if USE_CODEC_VORBIS +#ifdef USE_CODEC_VORBIS // includes for the Q3 sound system #include "client.h" diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c index a93c2d2..10b4c35 100644 --- a/code/client/snd_openal.c +++ b/code/client/snd_openal.c @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "snd_codec.h" #include "client.h" -#if USE_OPENAL +#ifdef USE_OPENAL #include "qal.h" @@ -1864,7 +1864,7 @@ S_AL_Init */ qboolean S_AL_Init( soundInterface_t *si ) { -#if USE_OPENAL +#ifdef USE_OPENAL qboolean enumsupport, founddev = qfalse; |