[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61145] trunk/blender/source/blender/ editors/space_file/fsmenu.c: Since we dropped carbon api, this workaround seems not longer to be necessary, pls.

[jens verwiebe]

Revision: 61145
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61145
Author:   jensverwiebe
Date:     2013-11-05 17:35:47 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
Since we dropped carbon api, this workaround seems not longer to be necessary, pls. keep an eye

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/fsmenu.c

Modified: trunk/blender/source/blender/editors/space_file/fsmenu.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/fsmenu.c	2013-11-05 16:24:00 UTC (rev 61144)
+++ trunk/blender/source/blender/editors/space_file/fsmenu.c	2013-11-05 17:35:47 UTC (rev 61145)
@@ -55,9 +55,7 @@
 #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 <Carbon/Carbon.h>
 #endif /* __APPLE__ */
 
 #ifdef __linux__