diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-07-28 20:56:22 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-07-28 20:56:22 +0400 |
| commit | e3d17ca33d61b320e1337bec1998c75c8606917f (patch) | |
| tree | 8652f492190dba62fb8ba680de28f22d23c0cb53 /source/blender/editors/space_file | |
| parent | 87b547c79f9d2e24f8d33fbeb376fdbe43891b14 (diff) | |
2.5
OSX fix:
carbon code can not be included in blender code, it conflicts with struct ID
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 9d80dd7273a..12a3c38ab09 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -51,6 +51,8 @@ #endif #ifdef __APPLE__ +/* XXX BIG WARNING: carbon.h can not be included in blender code, it conflicts with struct ID */ +#define ID ID_ #include <CoreServices/CoreServices.h> #include "BKE_utildefines.h" |