Shrunk the hack so it didn't get used in newer versions of OpenAL which
authorKent Mein <mein@cs.umn.edu>
Fri, 20 Dec 2002 19:27:39 +0000 (19:27 +0000)
committerKent Mein <mein@cs.umn.edu>
Fri, 20 Dec 2002 19:27:39 +0000 (19:27 +0000)
seems to be working.

Kent

(diff follows)

Index: SND_OpenALDevice.cpp
===================================================================
RCS file: /cvs01/blender/source/gameengine/SoundSystem/openal/SND_OpenALDevice.cpp,v
retrieving revision 1.4
diff -u -r1.4 SND_OpenALDevice.cpp
--- SND_OpenALDevice.cpp        2002/11/25 15:29:57     1.4
+++ SND_OpenALDevice.cpp        2002/12/20 19:26:04
@@ -59,7 +59,7 @@
 #include <fcntl.h>

 /* untill openal gets unified we need this hack for non-windows systems */
-#ifndef WIN32
+#if !defined(WIN32) && !defined(ALC_MAJOR_VERSION)

intern/SoundSystem/openal/SND_OpenALDevice.cpp

index 67c7f1f2362851d1e6fb785d28559b5a71c21a7e..3c55b1e77ca31f93249a1876ccb715a2d4880b51 100644 (file)
@@ -59,7 +59,7 @@
 #include <fcntl.h>
 
 /* untill openal gets unified we need this hack for non-windows systems */
-#ifndef WIN32
+#if !defined(WIN32) && !defined(ALC_MAJOR_VERSION)
 
 #include <malloc.h>