From 8f89b366836fc69170e1c03d1b640caddd9ea33e Mon Sep 17 00:00:00 2001
From: tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Wed, 26 Oct 2005 19:32:15 +0000
Subject: * Fixed some warnings on the OS X build

git-svn-id: svn://svn.icculus.org/quake3/trunk@180 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/macosx/Quake3.pbproj/project.pbxproj | 8 +++++++-
 code/macosx/macosx_display.m              | 4 ----
 code/macosx/macosx_glsmp_mutex.m          | 2 +-
 code/macosx/macosx_sys.m                  | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'code')

diff --git a/code/macosx/Quake3.pbproj/project.pbxproj b/code/macosx/Quake3.pbproj/project.pbxproj
index 01f5747..195dbb0 100644
--- a/code/macosx/Quake3.pbproj/project.pbxproj
+++ b/code/macosx/Quake3.pbproj/project.pbxproj
@@ -34,6 +34,7 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_LDFLAGS = "-bundle -undefined error";
 				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
 				PRODUCT_NAME = qagame;
 				PROFILE_FLAGS = "";
 				SECTORDER_FLAGS = "";
@@ -170,6 +171,7 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_LDFLAGS = "-bundle -undefined error";
 				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
 				PRODUCT_NAME = cgame;
 				PROFILE_FLAGS = "";
 				SECTORDER_FLAGS = "";
@@ -4764,6 +4766,7 @@
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "-bundle -undefined error";
 				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
 				PRODUCT_NAME = ui;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
@@ -4977,6 +4980,7 @@
 				OTHER_CFLAGS = "-DDEDICATED -DMACOS_X -DBOTLIB -DMISSIONPACK -force_cpusubtype_ALL -Wno-long-double";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
 				PRODUCT_NAME = Q3DedicatedServer;
 				REZ_EXECUTABLE = YES;
 				SECTORDER_FLAGS = "";
@@ -7716,8 +7720,8 @@
 				LIBRARY_SEARCH_PATHS = "";
 				OPTIMIZATION_CFLAGS = "-O2";
 				OTHER_CFLAGS = "-DMACOS_X -DBOTLIB -DMISSIONPACK -DSMP -force_cpusubtype_ALL";
-				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
 				PRODUCT_NAME = Quake3;
 				SECTORDER_FLAGS = "";
 				USE_GCC3_PFE_SUPPORT = NO;
@@ -8758,6 +8762,7 @@
 				OTHER_CFLAGS = "-DMACOS_X -DBOTLIB -DMISSIONPACK -DSMP -force_cpusubtype_ALL -faltivec";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
 				PRODUCT_NAME = "Quake3 G4";
 				SECTORDER_FLAGS = "";
 				USE_GCC3_PFE_SUPPORT = NO;
@@ -10327,6 +10332,7 @@
 				OTHER_CFLAGS = "-DMACOS_X -DBOTLIB -DMISSIONPACK -DSMP -force_cpusubtype_ALL -faltivec -falign-loops=16 -falign-jumps=16 -fstrict-aliasing ";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
+				PREBINDING = NO;
 				PRODUCT_NAME = Q3DedicatedServer;
 				REZ_EXECUTABLE = YES;
 				SECTORDER_FLAGS = "";
diff --git a/code/macosx/macosx_display.m b/code/macosx/macosx_display.m
index 52235a5..ae8ee13 100644
--- a/code/macosx/macosx_display.m
+++ b/code/macosx/macosx_display.m
@@ -232,7 +232,6 @@ void Sys_SetScreenFade(glwgamma_t *table, float fraction)
 void Sys_FadeScreens()
 {
     CGDisplayCount displayIndex;
-    int stepIndex;
     glwgamma_t *table;
     NSTimeInterval start, current;
     float time;
@@ -261,7 +260,6 @@ void Sys_FadeScreen(CGDirectDisplayID display)
 {
     CGDisplayCount displayIndex;
     glwgamma_t *table;
-    int stepIndex;
     
     if (!glConfig.deviceSupportsGamma)
         return;
@@ -295,7 +293,6 @@ void Sys_FadeScreen(CGDirectDisplayID display)
 void Sys_UnfadeScreens()
 {
     CGDisplayCount displayIndex;
-    int stepIndex;
     glwgamma_t *table;
     NSTimeInterval start, current;
     float time;
@@ -323,7 +320,6 @@ void Sys_UnfadeScreens()
 void Sys_UnfadeScreen(CGDirectDisplayID display, glwgamma_t *table)
 {
     CGDisplayCount displayIndex;
-    int stepIndex;
     
     if (!glConfig.deviceSupportsGamma)
         return;
diff --git a/code/macosx/macosx_glsmp_mutex.m b/code/macosx/macosx_glsmp_mutex.m
index f8e1cc6..eff1fba 100644
--- a/code/macosx/macosx_glsmp_mutex.m
+++ b/code/macosx/macosx_glsmp_mutex.m
@@ -84,7 +84,7 @@ qboolean GLimp_SpawnRenderThread( void (*function)( void ) )
 // The command buffer returned might be NULL, indicating that the rendering thread should exit.
 void *GLimp_RendererSleep(void)
 {
-    void *data;
+    volatile void *data;
     
     GLSTAMP("GLimp_RendererSleep start", 0);
 
diff --git a/code/macosx/macosx_sys.m b/code/macosx/macosx_sys.m
index 4445328..d9bcd44 100644
--- a/code/macosx/macosx_sys.m
+++ b/code/macosx/macosx_sys.m
@@ -85,8 +85,8 @@ extern char		*FS_BuildOSPath( const char *base, const char *game, const char *qp
 void    * QDECL Sys_LoadDll( const char *name, char *fqpath , long (QDECL **entryPoint)(long, ...),
                                  long (QDECL *systemcalls)(long, ...) ) {
     void *libHandle;
-    void	(*dllEntry)( int (*syscallptr)(int, ...) );
-    NSString *bundlePath, *libraryPath;
+    void	(*dllEntry)( long (*syscallptr)(long, ...) );
+    NSString *libraryPath;
     const char *path;
     
 	// TTimo
@@ -320,7 +320,7 @@ qboolean Sys_ObjectIsCDRomDevice(io_object_t object)
 {
     CFStringRef value;
     kern_return_t krc;
-    CFDictionaryRef properties;
+    CFMutableDictionaryRef properties;
     qboolean isCDROM = qfalse;
     io_iterator_t parentIterator;
     io_object_t parent;
-- 
cgit v1.2.3