Commit c1f3ae02 authored by David Gobbi's avatar David Gobbi
Browse files

BUG: need to undefine "Status" macro on i386-OSX

parent a1dee511
......@@ -31,6 +31,14 @@ extern "C"
#endif
#ifdef VTK_USE_CARBON
// Tk #defines Status in:
// Tk.framework/Versions/8.4/Headers/X11/Xlib.h,
// which conflicts with a member of the FPUInformationIntel
// struct in Apple's new headers for i386:
// CarbonCore.framework/Versions/A/Headers/MachineExceptions.h
#if defined (i386)
#undef Status
#endif /* defined (i386) */
#include "tkMacOSXInt.h"
#endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment