Another #define __CARBONSOUND__ needed because of wacko Quicktime decision

to leave carbon framework in bad state.

diff --git a/source/blender/quicktime/quicktime_import.h b/source/blender/quicktime/quicktime_import.h
index f8fe178a04f2971314a6e71a7af4285ac184db04..58f20e4bf16147ff4ef9c38c5b73340603c85b1d 100644 (file)
--- a/source/blender/quicktime/quicktime_import.h
+++ b/source/blender/quicktime/quicktime_import.h
@@ -49,6 +49,7 @@
 #ifdef _WIN32
 #include <Movies.h>
 #elif defined(__APPLE__)
+#define __CARBONSOUND__
 #import <Carbon/Carbon.h>
 #include <QuickTime/Movies.h>
 #endif

diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c
index e28b604935a46b78046f340c0496a64a009c43e9..207ab2c27d206e493e3ea641d8cf8ab9e5d635dc 100644 (file)
--- a/source/blender/src/ghostwinlay.c
+++ b/source/blender/src/ghostwinlay.c
@@ -62,6 +62,7 @@
 
 #ifdef __APPLE__
 #include <OpenGL/OpenGL.h>
+#define __CARBONSOUND__
 #include <Carbon/Carbon.h>
 
 /*declarations*/