Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2003-12-07 15:55:18 +0300
committerTon Roosendaal <ton@blender.org>2003-12-07 15:55:18 +0300
commitdae2b1740031024e70b81a6775a1d39b675e3a87 (patch)
treec5566d61ce5a645f8142cb10fe5811d883b611fa /source/blender/quicktime/quicktime_import.h
parent7ab1c64c7a1366320dae921bac5f4cbfd1df3788 (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!
Diffstat (limited to 'source/blender/quicktime/quicktime_import.h')
-rw-r--r--source/blender/quicktime/quicktime_import.h2
1 files changed, 2 insertions, 0 deletions
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