From e3d17ca33d61b320e1337bec1998c75c8606917f Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 28 Jul 2009 16:56:22 +0000 Subject: [PATCH] 2.5 OSX fix: carbon code can not be included in blender code, it conflicts with struct ID --- source/blender/editors/space_file/fsmenu.c | 2 ++ 1 file changed, 2 insertions(+) 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 #include "BKE_utildefines.h"