Revision: 21976
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21976
Author: ton
Date: 2009-07-28 18:56:22 +0200 (Tue, 28 Jul 2009)
Log Message:
-----------
2.5
OSX fix:
carbon code can not be included in blender code, it conflicts with struct ID
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_file/fsmenu.c
Modified: branches/blender2.5/blender/source/blender/editors/space_file/fsmenu.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/fsmenu.c
2009-07-28 16:50:13 UTC (rev 21975)
+++ branches/blender2.5/blender/source/blender/editors/space_file/fsmenu.c
2009-07-28 16:56:22 UTC (rev 21976)
@@ -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"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
