2.5
authorTon Roosendaal <ton@blender.org>
Tue, 28 Jul 2009 16:56:22 +0000 (16:56 +0000)
committerTon Roosendaal <ton@blender.org>
Tue, 28 Jul 2009 16:56:22 +0000 (16:56 +0000)
OSX fix:
carbon code can not be included in blender code, it conflicts with struct ID

source/blender/editors/space_file/fsmenu.c

index 9d80dd7273a499aca66a0ff577bbc5f4846b02ee..12a3c38ab0946603eae5fcadbc5e526e6b917701 100644 (file)
@@ -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"