diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-05 21:35:47 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-05 21:35:47 +0400 |
| commit | eabc16ab5294b4df81101e3ceaab1508d7396104 (patch) | |
| tree | 39e10a59c7694b5a468e17407d09961f58e38448 /source/blender/editors/space_file | |
| parent | 538a6ed57a0b0576617b1f5546bbc9f936338ab5 (diff) | |
Since we dropped carbon api, this workaround seems not longer to be necessary, pls. keep an eye
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 0227230fb68..62cf4889797 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -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__ |