[patch] make it compile on macosx

openal.patch (text/plain), 2.22 KB, created by Dirk Schoenberger on 2006-02-15 14:09:43 UTC

diff -uNr openal-20050504-r2/work/openal-20050504/linux/src/alut/alut_wav.c openal-20050504-r2.orig/work/openal-20050504/linux/src/alut/alut_wav.c
--- openal-20050504-r2/work/openal-20050504/linux/src/alut/alut_wav.c	2006-02-15 22:48:41.000000000 +0100
+++ openal-20050504-r2.orig/work/openal-20050504/linux/src/alut/alut_wav.c	2006-02-15 23:03:22.000000000 +0100
@@ -165,8 +165,11 @@
 		       ALenum *format,
 		       ALvoid **data,
 		       ALsizei *size,
-		       ALsizei *freq,
-		       ALboolean *loop)
+		       ALsizei *freq
+#ifndef MACINTOSH_AL		       
+		       , ALboolean *loop
+#endif
+		       )
 {
 	ALboolean ret;
 	ALsizei bits_dummy;
@@ -178,10 +181,12 @@
 			   &bits_dummy,
 			   freq );
 
+#ifndef MACINTOSH_AL
 	if(loop)
 	{
 		*loop = AL_FALSE;
 	}
+#endif	
 
 	return;
 }
@@ -190,8 +195,11 @@
 		       ALenum *format,
 		       ALvoid **data,
 		       ALsizei *size,
-		       ALsizei *freq,
-		       ALboolean *loop)
+		       ALsizei *freq
+#ifndef MACINTOSH_AL
+		       ,  ALboolean *loop
+#endif
+			)
 {
 	ALushort alFmt  = 0;
 	ALushort acChan = 0;
@@ -211,8 +219,11 @@
 	*format = (ALsizei) alFmt;
 	*freq   = (ALsizei) acFreq;
 	*size   = (ALsizei) acSize;
+	
+#ifndef MACINTOSH_AL	
 	*loop   = AL_FALSE; /* JIV FIXME */
 	/* *bits   = (ALsizei) _al_formatbits(alFmt); */
+#endif
 
 	_alDebug(ALD_CONVERT, __FILE__, __LINE__,
 		"alutLoadWAVMemory with [format/size/bits/freq] = [0x%x/%d/%d]",
diff -uNr openal-20050504-r2/work/openal-20050504/linux/src/arch/darwin/darwin_native.c openal-20050504-r2.orig/work/openal-20050504/linux/src/arch/darwin/darwin_native.c
--- openal-20050504-r2/work/openal-20050504/linux/src/arch/darwin/darwin_native.c	2006-02-15 22:44:46.000000000 +0100
+++ openal-20050504-r2.orig/work/openal-20050504/linux/src/arch/darwin/darwin_native.c	2006-02-15 23:03:22.000000000 +0100
@@ -409,13 +409,13 @@
 float get_nativechannel(UNUSED(void *handle), UNUSED(ALCenum channel))
 {
     implement_me("float get_nativechannel()");
-    return NULL;
+    return 0.0;
 }
 
 int   set_nativechannel(UNUSED(void *handle),UNUSED( ALCenum channel),UNUSED( float volume))
 {
     implement_me("int set_nativechannel()");
-    return NULL;
+    return 0;
 }
 
 void pause_nativedevice(void *handle) /* Not tested :-( */