diff options
| author | Ton Roosendaal <ton@blender.org> | 2003-12-07 15:55:18 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2003-12-07 15:55:18 +0300 |
| commit | dae2b1740031024e70b81a6775a1d39b675e3a87 (patch) | |
| tree | c5566d61ce5a645f8142cb10fe5811d883b611fa | |
| parent | 7ab1c64c7a1366320dae921bac5f4cbfd1df3788 (diff) | |
- 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!
| -rw-r--r-- | source/blender/quicktime/quicktime_export.h | 2 | ||||
| -rw-r--r-- | source/blender/quicktime/quicktime_import.h | 2 |
2 files changed, 4 insertions, 0 deletions
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 <config.h> #endif |