[Bf-blender-cvs] Revision 49627 appears to break compile on OS X PPC scons, conflicting types

[Taylor Alan]

Fresh from a quick chat with Lukas on IRC, I'll submit this here for consideration.

Revision 49627 (http://lists.blender.org/pipermail/bf-blender-cvs/2012-August/048793.html) breaks my regular compiles on OS X 10.5.8 PPC scons (PowerBook G4, ATI RV360).  I would have reported sooner, but I've been away on holiday for a bit.

If you need any more information, please let me know.

Alan


scons: `/Users/user/compile/build/darwin/lib/libbf_ikplugin.a' is up to date.
Compiling ==> 'wm.c'
Compiling ==> 'wm_cursors.c'
Compiling ==> 'wm_dragdrop.c'
Compiling ==> 'wm_draw.c'
Compiling ==> 'wm_event_system.c'
Compiling ==> 'wm_files.c'
Compiling ==> 'wm_gesture.c'
Compiling ==> 'wm_init_exit.c'
Compiling ==> 'wm_jobs.c'
Compiling ==> 'wm_keymap.c'
Compiling ==> 'wm_operators.c'
Compiling ==> 'wm_playanim.c'
In file included from source/blender/makesdna/DNA_scene_types.h:46:0,
                 from source/blender/windowmanager/intern/wm_playanim.c:77:
source/blender/makesdna/DNA_ID.h:120:3: error: conflicting types for 'ID'
/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/AIFF.h:79:41: note: previous declaration of 'ID' was here
scons: *** [/Users/user/compile/build/darwin/source/blender/windowmanager/intern/wm_playanim.o] Error 1
scons: building terminated because of errors.
users-powerbook-g4-17:blender user$