New Tk build failure

gcc -c -g -pipe    -Wall -fno-common -I/Users/dgp/fossil/tk8.5/unix/../unix -I/Users/dgp/fossil/tk8.5/unix/../generic -I/Users/dgp/fossil/tk8.5/unix/../bitmaps -I/Users/dgp/fossil/tcl8.5/generic -I/Users/dgp/fossil/tcl8.5/unix -I/Users/dgp/fossil/tk8.5/unix/../macosx -I/Users/dgp/fossil/tk8.5/unix/../xlib -DPACKAGE_NAME=\"tk\" -DPACKAGE_TARNAME=\"tk\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tk\ 8.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_PTHREAD_GET_STACKSIZE_NP=1 -DTCL_THREADS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DMAC_OSX_TCL=1 -DHAVE_COREFOUNDATION=1 -DHAVE_CAST_TO_UNION=1 -DTCL_SHLIB_EXT=\".dylib\" -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_PW_GECOS=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_WEAK_IMPORT=1 -D_DARWIN_C_SOURCE=1 -DMAC_OSX_TK=1 -DTK_MAC_DEBUG=1 -DTK_FRAMEWORK=1       -std=gnu99 -x objective-c -DTK_FRAMEWORK_VERSION=\"8.5\" -DUSE_TCL_STUBS /Users/dgp/fossil/tk8.5/unix/../generic/tkStubLib.c
In file included from /Users/dgp/fossil/tk8.5/unix/../generic/tkStubLib.c:21:
In file included from /Users/dgp/fossil/tk8.5/unix/../macosx/tkMacOSXInt.h:27:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h:12:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h:151:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSAppleEventDescriptor.h:7:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/ApplicationServices.framework/Headers/ApplicationServices.h:35:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.h:43:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGDisplayStream.h:9:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/IOSurface.framework/Headers/IOSurfaceAPI.h:13:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/IOSurface.framework/Headers/IOSurfaceBase.h:30:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/xpc/xpc.h:330:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/launch.h:29:
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/mach/mach.h:86:15: error: 
      expected ')'
extern void                     panic(const char *, ...);
                                ^
/Users/dgp/fossil/tcl8.5/generic/tcl.h:2421:19: note: expanded from macro 'panic'
#   define panic                Tcl_Panic
                                ^
/Users/dgp/fossil/tcl8.5/generic/tclDecls.h:4160:14: note: expanded from macro 'Tcl_Panic'
        (tclStubsPtr->tcl_Panic) /* 2 */
                    ^
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/mach/mach.h:86:15: note: 
      to match this '('
/Users/dgp/fossil/tcl8.5/generic/tcl.h:2421:19: note: expanded from macro 'panic'
#   define panic                Tcl_Panic
                                ^
/Users/dgp/fossil/tcl8.5/generic/tclDecls.h:4160:2: note: expanded from macro 'Tcl_Panic'
        (tclStubsPtr->tcl_Panic) /* 2 */
        ^
In file included from /Users/dgp/fossil/tk8.5/unix/../generic/tkStubLib.c:21:
In file included from /Users/dgp/fossil/tk8.5/unix/../macosx/tkMacOSXInt.h:27:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h:12:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h:151:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSAppleEventDescriptor.h:7:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/ApplicationServices.framework/Headers/ApplicationServices.h:35:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.h:43:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGDisplayStream.h:9:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/IOSurface.framework/Headers/IOSurfaceAPI.h:13:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/IOSurface.framework/Headers/IOSurfaceBase.h:30:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/xpc/xpc.h:330:
In file included from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/launch.h:29:
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/mach/mach.h:86:15: error: 
      redefinition of 'tclStubsPtr' as different kind of symbol
extern void                     panic(const char *, ...);
                                ^
/Users/dgp/fossil/tcl8.5/generic/tcl.h:2421:19: note: expanded from macro 'panic'
#   define panic                Tcl_Panic
                                ^
/Users/dgp/fossil/tcl8.5/generic/tclDecls.h:4160:3: note: expanded from macro 'Tcl_Panic'
        (tclStubsPtr->tcl_Panic) /* 2 */
         ^
/Users/dgp/fossil/tcl8.5/generic/tclDecls.h:4138:18: note: previous definition is here
extern TclStubs *tclStubsPtr;
                 ^
2 errors generated.