- committed in the 'hack' as mailed to committers list by Douglas B, which
authorTon Roosendaal <ton@blender.org>
Sun, 7 Dec 2003 12:55:18 +0000 (12:55 +0000)
committerTon Roosendaal <ton@blender.org>
Sun, 7 Dec 2003 12:55:18 +0000 (12:55 +0000)
  he got from Nicolas Zinovieff, to solve the struct ID conflict with
  AIFF. By including a #define __AIFF__ in the top of the files, the
  blender includes won't get frustrated by an already defined struct ID.

  should still be tested for 10.3 and other OSX installs!

source/blender/quicktime/quicktime_export.h
source/blender/quicktime/quicktime_import.h

index 8153b7ba85f457591201af9abe69caf0d1de9665..faba95961f67d8a49d16a34df21dc52febd17940 100644 (file)
@@ -34,6 +34,8 @@
 
 #if defined (_WIN32) || (__APPLE__)
 
+#define __AIFF__
+
 // quicktime movie output functions
 
 void start_qt(void);                                   //for initrender.c
index 1289ffabd13c6adb8f83ddb7db9b2a74a435a8d5..a99827eb2f3ce5fe6b6b12eeac8d6c2023f1df3e 100644 (file)
@@ -36,6 +36,8 @@
 #ifndef __QUICKTIME_IMP_H__
 #define __QUICKTIME_IMP_H__
 
+#define __AIFF__
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif