From dae2b1740031024e70b81a6775a1d39b675e3a87 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sun, 7 Dec 2003 12:55:18 +0000 Subject: - committed in the 'hack' as mailed to committers list by Douglas B, which 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 | 2 ++ source/blender/quicktime/quicktime_import.h | 2 ++ 2 files changed, 4 insertions(+) (limited to 'source/blender/quicktime') diff --git a/source/blender/quicktime/quicktime_export.h b/source/blender/quicktime/quicktime_export.h index 8153b7ba85f..faba95961f6 100644 --- a/source/blender/quicktime/quicktime_export.h +++ b/source/blender/quicktime/quicktime_export.h @@ -34,6 +34,8 @@ #if defined (_WIN32) || (__APPLE__) +#define __AIFF__ + // quicktime movie output functions void start_qt(void); //for initrender.c diff --git a/source/blender/quicktime/quicktime_import.h b/source/blender/quicktime/quicktime_import.h index 1289ffabd13..a99827eb2f3 100644 --- a/source/blender/quicktime/quicktime_import.h +++ b/source/blender/quicktime/quicktime_import.h @@ -36,6 +36,8 @@ #ifndef __QUICKTIME_IMP_H__ #define __QUICKTIME_IMP_H__ +#define __AIFF__ + #ifdef HAVE_CONFIG_H #include #endif -- cgit v1.2.3