disallow colors like xellow

cleanup tkInt.decls
configure changes for cygwin

9 files changed, 331 insertions, 309 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 45447f5..39b121c 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -23,387 +23,386 @@ interface tkInt
 # risk. Note that the position of functions should not be changed between
 # versions to avoid gratuitous incompatibilities.
 
-declare 0 generic {
+declare 0 {
     TkWindow *TkAllocWindow(TkDisplay *dispPtr, int screenNum,
 	    TkWindow *parentPtr)
 }
-declare 1 generic {
+declare 1 {
     void TkBezierPoints(double control[], int numSteps, double *coordPtr)
 }
-declare 2 generic {
+declare 2 {
     void TkBezierScreenPoints(Tk_Canvas canvas, double control[],
 	    int numSteps, XPoint *xPointPtr)
 }
-declare 3 generic {
+declare 3 {
     void TkBindDeadWindow(TkWindow *winPtr)
 }
-declare 4 generic {
+declare 4 {
     void TkBindEventProc(TkWindow *winPtr, XEvent *eventPtr)
 }
-declare 5 generic {
+declare 5 {
     void TkBindFree(TkMainInfo *mainPtr)
 }
-declare 6 generic {
+declare 6 {
     void TkBindInit(TkMainInfo *mainPtr)
 }
-declare 7 generic {
+declare 7 {
     void TkChangeEventWindow(XEvent *eventPtr, TkWindow *winPtr)
 }
-declare 8 generic {
+declare 8 {
     int TkClipInit(Tcl_Interp *interp, TkDisplay *dispPtr)
 }
-declare 9 generic {
+declare 9 {
     void TkComputeAnchor(Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY,
 	    int innerWidth, int innerHeight, int *xPtr, int *yPtr)
 }
-declare 10 generic {
+declare 10 {
     int TkCopyAndGlobalEval(Tcl_Interp *interp, char *script)
 }
-declare 11 generic {
+declare 11 {
     unsigned long TkCreateBindingProcedure(Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable, ClientData object,
-	    CONST char *eventString, TkBindEvalProc *evalProc,
+	    const char *eventString, TkBindEvalProc *evalProc,
 	    TkBindFreeProc *freeProc, ClientData clientData)
 }
-declare 12 generic {
+declare 12 {
     TkCursor *TkCreateCursorFromData(Tk_Window tkwin,
-	    CONST char *source, CONST char *mask, int width, int height,
+	    const char *source, const char *mask, int width, int height,
 	    int xHot, int yHot, XColor fg, XColor bg)
 }
-declare 13 generic {
+declare 13 {
     int TkCreateFrame(ClientData clientData, Tcl_Interp *interp,
 	    int argc, char **argv, int toplevel, char *appName)
 }
-declare 14 generic {
+declare 14 {
     Tk_Window TkCreateMainWindow(Tcl_Interp *interp,
-	    CONST char *screenName, char *baseName)
+	    const char *screenName, char *baseName)
 }
-declare 15 generic {
+declare 15 {
     Time TkCurrentTime(TkDisplay *dispPtr)
 }
-declare 16 generic {
+declare 16 {
     void TkDeleteAllImages(TkMainInfo *mainPtr)
 }
-declare 17 generic {
+declare 17 {
     void TkDoConfigureNotify(TkWindow *winPtr)
 }
-declare 18 generic {
+declare 18 {
     void TkDrawInsetFocusHighlight(Tk_Window tkwin, GC gc, int width,
 	    Drawable drawable, int padding)
 }
-declare 19 generic {
+declare 19 {
     void TkEventDeadWindow(TkWindow *winPtr)
 }
-declare 20 generic {
+declare 20 {
     void TkFillPolygon(Tk_Canvas canvas, double *coordPtr, int numPoints,
 	    Display *display, Drawable drawable, GC gc, GC outlineGC)
 }
-declare 21 generic {
-    int TkFindStateNum(Tcl_Interp *interp, CONST char *option,
-	    CONST TkStateMap *mapPtr, CONST char *strKey)
+declare 21 {
+    int TkFindStateNum(Tcl_Interp *interp, const char *option,
+	    const TkStateMap *mapPtr, const char *strKey)
 }
-declare 22 generic {
-    char *TkFindStateString(CONST TkStateMap *mapPtr, int numKey)
+declare 22 {
+    char *TkFindStateString(const TkStateMap *mapPtr, int numKey)
 }
-declare 23 generic {
+declare 23 {
     void TkFocusDeadWindow(TkWindow *winPtr)
 }
-declare 24 generic {
+declare 24 {
     int TkFocusFilterEvent(TkWindow *winPtr, XEvent *eventPtr)
 }
-declare 25 generic {
+declare 25 {
     TkWindow *TkFocusKeyEvent(TkWindow *winPtr, XEvent *eventPtr)
 }
-declare 26 generic {
+declare 26 {
     void TkFontPkgInit(TkMainInfo *mainPtr)
 }
-declare 27 generic {
+declare 27 {
     void TkFontPkgFree(TkMainInfo *mainPtr)
 }
-declare 28 generic {
+declare 28 {
     void TkFreeBindingTags(TkWindow *winPtr)
 }
 
 # Name change only, TkFreeCursor in Tcl 8.0.x now TkpFreeCursor
-declare 29 generic {
+declare 29 {
     void TkpFreeCursor(TkCursor *cursorPtr)
 }
-declare 30 generic {
+declare 30 {
     char *TkGetBitmapData(Tcl_Interp *interp, char *string,
 	    char *fileName, int *widthPtr, int *heightPtr,
 	    int *hotXPtr, int *hotYPtr)
 }
-declare 31 generic {
+declare 31 {
     void TkGetButtPoints(double p1[], double p2[],
 	    double width, int project, double m1[], double m2[])
 }
-declare 32 generic {
+declare 32 {
     TkCursor *TkGetCursorByName(Tcl_Interp *interp,
 	    Tk_Window tkwin, Tk_Uid string)
 }
-declare 33 generic {
+declare 33 {
     CONST84_RETURN char *TkGetDefaultScreenName(Tcl_Interp *interp,
-	    CONST char *screenName)
+	    const char *screenName)
 }
-declare 34 generic {
+declare 34 {
     TkDisplay *TkGetDisplay(Display *display)
 }
-declare 35 generic {
-    int TkGetDisplayOf(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],
+declare 35 {
+    int TkGetDisplayOf(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[],
 	    Tk_Window *tkwinPtr)
 }
-declare 36 generic {
+declare 36 {
     TkWindow *TkGetFocusWin(TkWindow *winPtr)
 }
-declare 37 generic {
+declare 37 {
     int TkGetInterpNames(Tcl_Interp *interp, Tk_Window tkwin)
 }
-declare 38 generic {
+declare 38 {
     int TkGetMiterPoints(double p1[], double p2[], double p3[],
 	    double width, double m1[], double m2[])
 }
-declare 39 generic {
+declare 39 {
     void TkGetPointerCoords(Tk_Window tkwin, int *xPtr, int *yPtr)
 }
-declare 40 generic {
+declare 40 {
     void TkGetServerInfo(Tcl_Interp *interp, Tk_Window tkwin)
 }
-declare 41 generic {
+declare 41 {
     void TkGrabDeadWindow(TkWindow *winPtr)
 }
-declare 42 generic {
+declare 42 {
     int TkGrabState(TkWindow *winPtr)
 }
-declare 43 generic {
+declare 43 {
     void TkIncludePoint(Tk_Item *itemPtr, double *pointPtr)
 }
-declare 44 generic {
+declare 44 {
     void TkInOutEvents(XEvent *eventPtr, TkWindow *sourcePtr,
 	    TkWindow *destPtr, int leaveType, int enterType,
 	    Tcl_QueuePosition position)
 }
-declare 45 generic {
+declare 45 {
     void TkInstallFrameMenu(Tk_Window tkwin)
 }
-declare 46 generic {
+declare 46 {
     char *TkKeysymToString(KeySym keysym)
 }
-declare 47 generic {
+declare 47 {
     int TkLineToArea(double end1Ptr[], double end2Ptr[], double rectPtr[])
 }
-declare 48 generic {
+declare 48 {
     double TkLineToPoint(double end1Ptr[], double end2Ptr[], double pointPtr[])
 }
-declare 49 generic {
+declare 49 {
     int TkMakeBezierCurve(Tk_Canvas canvas, double *pointPtr, int numPoints,
 	    int numSteps, XPoint xPoints[], double dblPoints[])
 }
-declare 50 generic {
+declare 50 {
     void TkMakeBezierPostscript(Tcl_Interp *interp,
 	    Tk_Canvas canvas, double *pointPtr, int numPoints)
 }
-declare 51 generic {
+declare 51 {
     void TkOptionClassChanged(TkWindow *winPtr)
 }
-declare 52 generic {
+declare 52 {
     void TkOptionDeadWindow(TkWindow *winPtr)
 }
-declare 53 generic {
+declare 53 {
     int TkOvalToArea(double *ovalPtr, double *rectPtr)
 }
-declare 54 generic {
+declare 54 {
     double TkOvalToPoint(double ovalPtr[],
 	    double width, int filled, double pointPtr[])
 }
-declare 55 generic {
+declare 55 {
     int TkpChangeFocus(TkWindow *winPtr, int force)
 }
-declare 56 generic {
+declare 56 {
     void TkpCloseDisplay(TkDisplay *dispPtr)
 }
-declare 57 generic {
+declare 57 {
     void TkpClaimFocus(TkWindow *topLevelPtr, int force)
 }
-declare 58 generic {
-    void TkpDisplayWarning(CONST char *msg, CONST char *title)
+declare 58 {
+    void TkpDisplayWarning(const char *msg, const char *title)
 }
-declare 59 generic {
+declare 59 {
     void TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name)
 }
-declare 60 generic {
+declare 60 {
     TkWindow *TkpGetOtherWindow(TkWindow *winPtr)
 }
-declare 61 generic {
+declare 61 {
     TkWindow *TkpGetWrapperWindow(TkWindow *winPtr)
 }
-declare 62 generic {
+declare 62 {
     int TkpInit(Tcl_Interp *interp)
 }
-declare 63 generic {
+declare 63 {
     void TkpInitializeMenuBindings(Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable)
 }
-declare 64 generic {
+declare 64 {
     void TkpMakeContainer(Tk_Window tkwin)
 }
-declare 65 generic {
+declare 65 {
     void TkpMakeMenuWindow(Tk_Window tkwin, int transient)
 }
-declare 66 generic {
+declare 66 {
     Window TkpMakeWindow(TkWindow *winPtr, Window parent)
 }
-declare 67 generic {
-    void TkpMenuNotifyToplevelCreate(Tcl_Interp *interp1, char *menuName)
+declare 67 {
+    void TkpMenuNotifyToplevelCreate(Tcl_Interp *interp, char *menuName)
 }
-declare 68 generic {
-    TkDisplay *TkpOpenDisplay(CONST char *display_name)
+declare 68 {
+    TkDisplay *TkpOpenDisplay(const char *display_name)
 }
-declare 69 generic {
+declare 69 {
     int TkPointerEvent(XEvent *eventPtr, TkWindow *winPtr)
 }
-declare 70 generic {
+declare 70 {
     int TkPolygonToArea(double *polyPtr, int numPoints, double *rectPtr)
 }
-declare 71 generic {
+declare 71 {
     double TkPolygonToPoint(double *polyPtr, int numPoints, double *pointPtr)
 }
-declare 72 generic {
+declare 72 {
     int TkPositionInTree(TkWindow *winPtr, TkWindow *treePtr)
 }
-declare 73 generic {
+declare 73 {
     void TkpRedirectKeyEvent(TkWindow *winPtr, XEvent *eventPtr)
 }
-declare 74 generic {
+declare 74 {
     void TkpSetMainMenubar(Tcl_Interp *interp, Tk_Window tkwin, char *menuName)
 }
-declare 75 generic {
-    int TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin, CONST char *string)
+declare 75 {
+    int TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin, const char *string)
 }
-declare 76 generic {
+declare 76 {
     int TkpWindowWasRecentlyDeleted(Window win, TkDisplay *dispPtr)
 }
-declare 77 generic {
+declare 77 {
     void TkQueueEventForAllChildren(TkWindow *winPtr, XEvent *eventPtr)
 }
-declare 78 generic {
-    int TkReadBitmapFile(Display *display, Drawable d, CONST char *filename,
+declare 78 {
+    int TkReadBitmapFile(Display *display, Drawable d, const char *filename,
 	    unsigned int *width_return, unsigned int *height_return,
 	    Pixmap *bitmap_return, int *x_hot_return, int *y_hot_return)
 }
-declare 79 generic {
+declare 79 {
     int TkScrollWindow(Tk_Window tkwin, GC gc, int x, int y,
 	    int width, int height, int dx, int dy, TkRegion damageRgn)
 }
-declare 80 generic {
+declare 80 {
     void TkSelDeadWindow(TkWindow *winPtr)
 }
-declare 81 generic {
+declare 81 {
     void TkSelEventProc(Tk_Window tkwin, XEvent *eventPtr)
 }
-declare 82 generic {
+declare 82 {
     void TkSelInit(Tk_Window tkwin)
 }
-declare 83 generic {
+declare 83 {
     void TkSelPropProc(XEvent *eventPtr)
 }
 
 # Exported publically as Tk_SetClassProcs in 8.4a2
-#declare 84 generic {
+#declare 84 {
 #    void TkSetClassProcs(Tk_Window tkwin,
 #	    TkClassProcs *procs, ClientData instanceData)
 #}
-
-declare 85 generic {
+declare 85 {
     void TkSetWindowMenuBar(Tcl_Interp *interp, Tk_Window tkwin,
 	    char *oldMenuName, char *menuName)
 }
-declare 86 generic {
+declare 86 {
     KeySym TkStringToKeysym(char *name)
 }
-declare 87 generic {
+declare 87 {
     int TkThickPolyLineToArea(double *coordPtr, int numPoints,
 	    double width, int capStyle, int joinStyle, double *rectPtr)
 }
-declare 88 generic {
+declare 88 {
     void TkWmAddToColormapWindows(TkWindow *winPtr)
 }
-declare 89 generic {
+declare 89 {
     void TkWmDeadWindow(TkWindow *winPtr)
 }
-declare 90 generic {
+declare 90 {
     TkWindow *TkWmFocusToplevel(TkWindow *winPtr)
 }
-declare 91 generic {
+declare 91 {
     void TkWmMapWindow(TkWindow *winPtr)
 }
-declare 92 generic {
+declare 92 {
     void TkWmNewWindow(TkWindow *winPtr)
 }
-declare 93 generic {
+declare 93 {
     void TkWmProtocolEventProc(TkWindow *winPtr, XEvent *evenvPtr)
 }
-declare 94 generic {
+declare 94 {
     void TkWmRemoveFromColormapWindows(TkWindow *winPtr)
 }
-declare 95 generic {
+declare 95 {
     void TkWmRestackToplevel(TkWindow *winPtr, int aboveBelow,
 	    TkWindow *otherPtr)
 }
-declare 96 generic {
+declare 96 {
     void TkWmSetClass(TkWindow *winPtr)
 }
-declare 97 generic {
+declare 97 {
     void TkWmUnmapWindow(TkWindow *winPtr)
 }
 
 # new for 8.1
 
-declare 98 generic {
+declare 98 {
     Tcl_Obj *TkDebugBitmap(Tk_Window tkwin, char *name)
 }
-declare 99 generic {
+declare 99 {
     Tcl_Obj *TkDebugBorder(Tk_Window tkwin, char *name)
 }
-declare 100 generic {
+declare 100 {
     Tcl_Obj *TkDebugCursor(Tk_Window tkwin, char *name)
 }
-declare 101 generic {
+declare 101 {
     Tcl_Obj *TkDebugColor(Tk_Window tkwin, char *name)
 }
-declare 102 generic {
+declare 102 {
     Tcl_Obj *TkDebugConfig(Tcl_Interp *interp, Tk_OptionTable table)
 }
-declare 103 generic {
+declare 103 {
     Tcl_Obj *TkDebugFont(Tk_Window tkwin, char *name)
 }
-declare 104 generic {
+declare 104 {
     int TkFindStateNumObj(Tcl_Interp *interp, Tcl_Obj *optionPtr,
-	    CONST TkStateMap *mapPtr, Tcl_Obj *keyPtr)
+	    const TkStateMap *mapPtr, Tcl_Obj *keyPtr)
 }
-declare 105 generic {
+declare 105 {
     Tcl_HashTable *TkGetBitmapPredefTable(void)
 }
-declare 106 generic {
+declare 106 {
     TkDisplay *TkGetDisplayList(void)
 }
-declare 107 generic {
+declare 107 {
     TkMainInfo *TkGetMainInfoList(void)
 }
-declare 108 generic {
+declare 108 {
     int TkGetWindowFromObj(Tcl_Interp *interp, Tk_Window tkwin,
 	    Tcl_Obj *objPtr, Tk_Window *windowPtr)
 }
-declare 109 generic {
+declare 109 {
     char *TkpGetString(TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr)
 }
-declare 110 generic {
+declare 110 {
     void TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont)
 }
-declare 111 generic {
+declare 111 {
     Tcl_Obj *TkpGetSystemDefault(Tk_Window tkwin,
-	    CONST char *dbName, CONST char *className)
+	    const char *dbName, const char *className)
 }
-declare 112 generic {
+declare 112 {
     void TkpMenuThreadInit(void)
 }
 declare 113 {aqua win} {
@@ -430,142 +429,142 @@ declare 119 {aqua win} {
 	    TkRegion src, TkRegion dr_return)
 }
 declare 121 aqua {
-    Pixmap TkpCreateNativeBitmap(Display *display, CONST char *source)
+    Pixmap TkpCreateNativeBitmap(Display *display, const char *source)
 }
 declare 122 aqua {
     void TkpDefineNativeBitmaps(void)
 }
 declare 124 aqua {
     Pixmap TkpGetNativeAppBitmap(Display *display,
- 	    CONST char *name, int *width, int *height)
+ 	    const char *name, int *width, int *height)
 }
-declare 135 generic {
+declare 135 {
     void TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC, GC bgGC,
         int highlightWidth, Drawable drawable)
 }
-declare 136 generic {
+declare 136 {
     void TkSetFocusWin(TkWindow *winPtr, int force)
 }
-declare 137 generic {
+declare 137 {
     void TkpSetKeycodeAndState(Tk_Window tkwin, KeySym keySym,
             XEvent *eventPtr)
 }
-declare 138 generic {
+declare 138 {
     KeySym TkpGetKeySym(TkDisplay *dispPtr, XEvent *eventPtr)
 }
-declare 139 generic {
+declare 139 {
     void TkpInitKeymapInfo(TkDisplay *dispPtr)
 }
-declare 140 generic {
+declare 140 {
     TkRegion TkPhotoGetValidRegion(Tk_PhotoHandle handle)
 }
-declare 141 generic {
+declare 141 {
     TkWindow **TkWmStackorderToplevel(TkWindow *parentPtr)
 }
-declare 142 generic {
+declare 142 {
     void TkFocusFree(TkMainInfo *mainPtr)
 }
-declare 143 generic {
+declare 143 {
     void TkClipCleanup(TkDisplay *dispPtr)
 }
-declare 144 generic {
+declare 144 {
     void TkGCCleanup(TkDisplay *dispPtr)
 }
 declare 145 {win aqua} {
     void TkSubtractRegion(TkRegion sra, TkRegion srcb, TkRegion dr_return)
 }
-declare 146 generic {
+declare 146 {
     void TkStylePkgInit(TkMainInfo *mainPtr)
 }
-declare 147 generic {
+declare 147 {
     void TkStylePkgFree(TkMainInfo *mainPtr)
 }
-declare 148 generic {
+declare 148 {
     Tk_Window TkToplevelWindowForCommand(Tcl_Interp *interp,
-	    CONST char *cmdName)
+	    const char *cmdName)
 }
-declare 149 generic {
-    CONST Tk_OptionSpec *TkGetOptionSpec(CONST char *name,
+declare 149 {
+    const Tk_OptionSpec *TkGetOptionSpec(const char *name,
 	    Tk_OptionTable optionTable)
 }
 
 # TIP#168
-declare 150 generic {
+declare 150 {
     int TkMakeRawCurve(Tk_Canvas canvas, double *pointPtr, int numPoints,
 	    int numSteps, XPoint xPoints[], double dblPoints[])
 }
-declare 151 generic {
+declare 151 {
     void TkMakeRawCurvePostscript(Tcl_Interp *interp,
 	    Tk_Canvas canvas, double *pointPtr, int numPoints)
 }
-declare 152 generic {
+declare 152 {
     void TkpDrawFrame(Tk_Window tkwin, Tk_3DBorder border,
 	    int highlightWidth, int borderWidth, int relief)
 }
-declare 153 generic {
+declare 153 {
     void TkCreateThreadExitHandler(Tcl_ExitProc *proc, ClientData clientData)
 }
-declare 154 generic {
+declare 154 {
     void TkDeleteThreadExitHandler(Tcl_ExitProc *proc, ClientData clientData)
 }
 
 # entries needed only by tktest:
-declare 156 generic {
+declare 156 {
     int TkpTestembedCmd(ClientData clientData, Tcl_Interp *interp, int argc,
-	    CONST char **argv)
+	    const char **argv)
 }
-declare 157 generic {
+declare 157 {
     int TkpTesttextCmd(ClientData dummy, Tcl_Interp *interp, int argc,
-	    CONST char **argv)
+	    const char **argv)
 }
 
 # Next group of functions exposed due to [Bug 2768945]. Numbers are chosen so
 # as to match 8.6 branch/HEAD.
-declare 169 generic {
+declare 169 {
     int TkStateParseProc(ClientData clientData, Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *value, char *widgRec, int offset)
+	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
-declare 170 generic {
+declare 170 {
     char *TkStatePrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
-declare 171 generic {
+declare 171 {
     int TkCanvasDashParseProc(ClientData clientData, Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *value, char *widgRec, int offset)
+	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
-declare 172 generic {
+declare 172 {
     char *TkCanvasDashPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
-declare 173 generic {
+declare 173 {
     int TkOffsetParseProc(ClientData clientData, Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *value, char *widgRec, int offset)
+	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
-declare 174 generic {
+declare 174 {
     char *TkOffsetPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
-declare 175 generic {
+declare 175 {
     int TkPixelParseProc(ClientData clientData, Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *value, char *widgRec, int offset)
+	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
-declare 176 generic {
+declare 176 {
     char *TkPixelPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
-declare 177 generic {
+declare 177 {
     int TkOrientParseProc(ClientData clientData, Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *value, char *widgRec, int offset)
+	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
-declare 178 generic {
+declare 178 {
     char *TkOrientPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
-declare 179 generic {
+declare 179 {
     int TkSmoothParseProc(ClientData clientData, Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *value, char *widgRec, int offset)
+	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
-declare 180 generic {
+declare 180 {
     char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
@@ -605,7 +604,7 @@ declare 7 x11 {
     void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar)
 }
 declare 8 x11 {
-    int TkpScanWindowId(Tcl_Interp *interp, CONST char *string, Window *idPtr)
+    int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr)
 }
 declare 9 x11 {
     void TkWmCleanup(TkDisplay *dispPtr)
@@ -622,7 +621,7 @@ declare 12 x11 {
 # only needed by tktest:
 declare 13 x11 {
     int TkpTestsendCmd(ClientData clientData, Tcl_Interp *interp, int argc,
-	    CONST char **argv)
+	    const char **argv)
 }
 
 ################################
@@ -644,7 +643,7 @@ declare 5 win {
     void TkpPrintWindowId(char *buf, Window window)
 }
 declare 6 win {
-    int TkpScanWindowId(Tcl_Interp *interp, CONST char *string, Window *idPtr)
+    int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr)
 }
 declare 7 win {
     void TkpSetCapture(TkWindow *winPtr)
@@ -729,7 +728,7 @@ declare 31 win {
 }
 declare 32 win {
     Tcl_Obj *TkWinGetMenuSystemDefault(Tk_Window tkwin,
-	    CONST char *dbName, CONST char *className)
+	    const char *dbName, const char *className)
 }
 declare 33 win {
     int TkWinGetPlatformId(void)
@@ -760,7 +759,7 @@ declare 0 aqua {
 
 # removed duplicates from tkInt table
 #declare 1 aqua {
-#    Pixmap TkpCreateNativeBitmap(Display *display, CONST char *source)
+#    Pixmap TkpCreateNativeBitmap(Display *display, const char *source)
 #}
 #
 #declare 2 aqua {
@@ -933,7 +932,7 @@ declare 51 aqua {
 declare 53 aqua {
     unsigned long TkpGetMS(void)
 }
-
+
 ##############################################################################
 
 # Define the platform specific internal Xlib interfaces. These functions are
@@ -983,7 +982,6 @@ declare 9 win {
 declare 10 win {
     XHostAddress *XListHosts(Display *d, int *i, Bool *b)
 }
-
 # second parameter was of type KeyCode
 declare 11 win {
     KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i)
@@ -1161,7 +1159,7 @@ declare 61 win {
     Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x)
 }
 declare 62 win {
-    void XSetCommand(Display *d, Window w, CONST char **c, int i)
+    void XSetCommand(Display *d, Window w, const char **c, int i)
 }
 declare 63 win {
     void XSetIconName(Display *d, Window w, _Xconst char *c)
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 531ee5f..298c322 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -415,7 +415,7 @@ EXTERN Window		TkpMakeWindow(TkWindow *winPtr, Window parent);
 #ifndef TkpMenuNotifyToplevelCreate_TCL_DECLARED
 #define TkpMenuNotifyToplevelCreate_TCL_DECLARED
 /* 67 */
-EXTERN void		TkpMenuNotifyToplevelCreate(Tcl_Interp *interp1,
+EXTERN void		TkpMenuNotifyToplevelCreate(Tcl_Interp *interp,
 				char *menuName);
 #endif
 #ifndef TkpOpenDisplay_TCL_DECLARED
@@ -1110,7 +1110,7 @@ typedef struct TkIntStubs {
     void (*tkpMakeContainer) (Tk_Window tkwin); /* 64 */
     void (*tkpMakeMenuWindow) (Tk_Window tkwin, int transient); /* 65 */
     Window (*tkpMakeWindow) (TkWindow *winPtr, Window parent); /* 66 */
-    void (*tkpMenuNotifyToplevelCreate) (Tcl_Interp *interp1, char *menuName); /* 67 */
+    void (*tkpMenuNotifyToplevelCreate) (Tcl_Interp *interp, char *menuName); /* 67 */
     TkDisplay * (*tkpOpenDisplay) (CONST char *display_name); /* 68 */
     int (*tkPointerEvent) (XEvent *eventPtr, TkWindow *winPtr); /* 69 */
     int (*tkPolygonToArea) (double *polyPtr, int numPoints, double *rectPtr); /* 70 */
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 39465c9..69c7d25 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -111,7 +111,7 @@ Tk_MainEx(
     tsdPtr->interp = interp;
     Tcl_Preserve((ClientData) interp);
 
-#if defined(__WIN32__)
+#if defined(__WIN32__) && !defined(__CYGWIN__)
     Tk_InitConsoleChannels(interp);
 #endif
 
diff --git a/unix/configure b/unix/configure
index e4fbf75..cebf9a5 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7342,6 +7342,11 @@ fi;
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
+
+cat >>confdefs.h <<\_ACEOF
+#define NDEBUG 1
+_ACEOF
+
 	echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index ca77586..05a155b 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -775,6 +775,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
+	AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?])
 	AC_MSG_RESULT([no])
 	AC_DEFINE(TCL_CFG_OPTIMIZED, 1, [Is this an optimized build?])
     else
diff --git a/win/configure b/win/configure
index 29f68fb..85f61b7 100755
--- a/win/configure
+++ b/win/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AR ac_ct_AR RANLIB ac_ct_RANLIB RC ac_ct_RC SET_MAKE TCL_THREADS CYGPATH CELIB_DIR DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING MAN2TCLFLAGS CFLAGS_DEFAULT LDFLAGS_DEFAULT VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_DEFS BUILD_TCLSH TCLSH_PROG TK_WIN_VERSION MACHINE TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DBGX TK_LIB_FILE TK_DLL_FILE TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_BUILD_STUB_LIB_SPEC TK_SRC_DIR TK_BIN_DIR TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_DBGX CFG_TK_SHARED_LIB_SUFFIX CFG_TK_UNSHARED_LIB_SUFFIX CFG_TK_EXPORT_FILE_SUFFIX TK_SHARED_BUILD DEPARG EXTRA_CFLAGS STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX CC_OBJNAME CC_EXENAME LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LDFLAGS_CONSOLE LDFLAGS_WINDOW RC_OUT RC_TYPE RC_INCLUDE RC_DEFINE RC_DEFINES TK_RES RES LIBS_GUI DLLSUFFIX LIBPREFIX LIBSUFFIX EXESUFFIX LIBRARIES MAKE_LIB POST_MAKE_LIB MAKE_DLL MAKE_EXE TK_LIB_FLAG TK_LIB_SPEC TK_BUILD_LIB_SPEC TK_STUB_LIB_SPEC TK_STUB_LIB_PATH TK_BUILD_STUB_LIB_PATH TK_CC_SEARCH_FLAGS TK_LD_SEARCH_FLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AR ac_ct_AR RANLIB ac_ct_RANLIB RC ac_ct_RC SET_MAKE TCL_THREADS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_DEFS CYGPATH CELIB_DIR DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING MAN2TCLFLAGS CFLAGS_DEFAULT LDFLAGS_DEFAULT VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE BUILD_TCLSH TCLSH_PROG TK_WIN_VERSION MACHINE TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DBGX TK_LIB_FILE TK_DLL_FILE TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_BUILD_STUB_LIB_SPEC TK_SRC_DIR TK_BIN_DIR TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_DBGX CFG_TK_SHARED_LIB_SUFFIX CFG_TK_UNSHARED_LIB_SUFFIX CFG_TK_EXPORT_FILE_SUFFIX TK_SHARED_BUILD DEPARG EXTRA_CFLAGS STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX CC_OBJNAME CC_EXENAME LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LDFLAGS_CONSOLE LDFLAGS_WINDOW RC_OUT RC_TYPE RC_INCLUDE RC_DEFINE RC_DEFINES TK_RES RES LIBS_GUI DLLSUFFIX LIBPREFIX LIBSUFFIX EXESUFFIX LIBRARIES MAKE_LIB POST_MAKE_LIB MAKE_DLL MAKE_EXE TK_LIB_FLAG TK_LIB_SPEC TK_BUILD_LIB_SPEC TK_STUB_LIB_SPEC TK_STUB_LIB_PATH TK_BUILD_STUB_LIB_PATH TK_CC_SEARCH_FLAGS TK_LD_SEARCH_FLAGS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -851,8 +851,8 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-celib=DIR        use Windows/CE support library from DIR
   --with-tcl=DIR          use Tcl 8.5 binaries from DIR
+  --with-celib=DIR        use Windows/CE support library from DIR
 
 Some influential environment variables:
   CC          C compiler command
@@ -3111,6 +3111,101 @@ _ACEOF
 
 
 #--------------------------------------------------------------------
+# Locate and source the tclConfig.sh file.
+#--------------------------------------------------------------------
+
+
+    echo "$as_me:$LINENO: checking the location of tclConfig.sh" >&5
+echo $ECHO_N "checking the location of tclConfig.sh... $ECHO_C" >&6
+
+    if test -d ../../tcl8.5$TK_PATCH_LEVEL/win;  then
+	TCL_BIN_DIR_DEFAULT=../../tcl8.5$TK_PATCH_LEVEL/win
+    elif test -d ../../tcl8.5/win;  then
+	TCL_BIN_DIR_DEFAULT=../../tcl8.5/win
+    else
+	TCL_BIN_DIR_DEFAULT=../../tcl/win
+    fi
+
+
+# Check whether --with-tcl or --without-tcl was given.
+if test "${with_tcl+set}" = set; then
+  withval="$with_tcl"
+  TCL_BIN_DIR=$withval
+else
+  TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd`
+fi;
+    if test ! -d $TCL_BIN_DIR; then
+	{ { echo "$as_me:$LINENO: error: Tcl directory $TCL_BIN_DIR does not exist" >&5
+echo "$as_me: error: Tcl directory $TCL_BIN_DIR does not exist" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+    if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
+	if test ! -f $TCL_BIN_DIR/../unix/tclConfig.sh; then
+	    { { echo "$as_me:$LINENO: error: There is no tclConfig.sh in $TCL_BIN_DIR:  perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" >&5
+echo "$as_me: error: There is no tclConfig.sh in $TCL_BIN_DIR:  perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd`
+    fi
+    echo "$as_me:$LINENO: result: $TCL_BIN_DIR/tclConfig.sh" >&5
+echo "${ECHO_T}$TCL_BIN_DIR/tclConfig.sh" >&6
+
+
+    echo "$as_me:$LINENO: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+echo $ECHO_N "checking for existence of $TCL_BIN_DIR/tclConfig.sh... $ECHO_C" >&6
+
+    if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
+        echo "$as_me:$LINENO: result: loading" >&5
+echo "${ECHO_T}loading" >&6
+	. $TCL_BIN_DIR/tclConfig.sh
+    else
+        echo "$as_me:$LINENO: result: file not found" >&5
+echo "${ECHO_T}file not found" >&6
+    fi
+
+    #
+    # If the TCL_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable TCL_LIB_SPEC will be set to the value
+    # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC
+    # instead of TCL_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+
+    if test -f $TCL_BIN_DIR/Makefile ; then
+        TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
+        TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
+        TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
+    fi
+
+    #
+    # eval is required to do the TCL_DBGX substitution
+    #
+
+    eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
+    eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
+    eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
+
+    eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
+    eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
+    eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#--------------------------------------------------------------------
 # The statements below define a collection of compile flags.  This
 # macro depends on the value of SHARED_BUILD, and should be called
 # after SC_ENABLE_SHARED checks the configure switches.
@@ -3279,6 +3374,9 @@ fi
 
     if test "$GCC" = "yes"; then
 
+      if test "$TCL_CC" = "gcc"; then
+	CFLAGS="$CFLAGS -mwin32"
+      fi
       echo "$as_me:$LINENO: checking for cross-compile version of gcc" >&5
 echo $ECHO_N "checking for cross-compile version of gcc... $ECHO_C" >&6
 if test "${ac_cv_cross+set}" = set; then
@@ -4524,6 +4622,11 @@ fi;
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
 	DBGX=""
+
+cat >>confdefs.h <<\_ACEOF
+#define NDEBUG 1
+_ACEOF
+
 	echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 
@@ -4548,18 +4651,21 @@ _ACEOF
 
 
     if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define TCL_MEM_DEBUG 1
 _ACEOF
 
     fi
 
     if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define TCL_COMPILE_DEBUG 1
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define TCL_COMPILE_STATS 1
 _ACEOF
 
@@ -4637,102 +4743,6 @@ echo "${ECHO_T}$result" >&6
 
 
 
-#--------------------------------------------------------------------
-# Locate and source the tclConfig.sh file.
-#--------------------------------------------------------------------
-
-
-    echo "$as_me:$LINENO: checking the location of tclConfig.sh" >&5
-echo $ECHO_N "checking the location of tclConfig.sh... $ECHO_C" >&6
-
-    if test -d ../../tcl8.5$TK_PATCH_LEVEL/win;  then
-	TCL_BIN_DIR_DEFAULT=../../tcl8.5$TK_PATCH_LEVEL/win
-    elif test -d ../../tcl8.5/win;  then
-	TCL_BIN_DIR_DEFAULT=../../tcl8.5/win
-    else
-	TCL_BIN_DIR_DEFAULT=../../tcl/win
-    fi
-
-
-# Check whether --with-tcl or --without-tcl was given.
-if test "${with_tcl+set}" = set; then
-  withval="$with_tcl"
-  TCL_BIN_DIR=$withval
-else
-  TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd`
-fi;
-    if test ! -d $TCL_BIN_DIR; then
-	{ { echo "$as_me:$LINENO: error: Tcl directory $TCL_BIN_DIR does not exist" >&5
-echo "$as_me: error: Tcl directory $TCL_BIN_DIR does not exist" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-    if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
-	if test ! -f $TCL_BIN_DIR/../unix/tclConfig.sh; then
-	    { { echo "$as_me:$LINENO: error: There is no tclConfig.sh in $TCL_BIN_DIR:  perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" >&5
-echo "$as_me: error: There is no tclConfig.sh in $TCL_BIN_DIR:  perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-	TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd`
-	CFLAGS="$CFLAGS -mwin32"
-    fi
-    echo "$as_me:$LINENO: result: $TCL_BIN_DIR/tclConfig.sh" >&5
-echo "${ECHO_T}$TCL_BIN_DIR/tclConfig.sh" >&6
-
-
-    echo "$as_me:$LINENO: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
-echo $ECHO_N "checking for existence of $TCL_BIN_DIR/tclConfig.sh... $ECHO_C" >&6
-
-    if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
-        echo "$as_me:$LINENO: result: loading" >&5
-echo "${ECHO_T}loading" >&6
-	. $TCL_BIN_DIR/tclConfig.sh
-    else
-        echo "$as_me:$LINENO: result: file not found" >&5
-echo "${ECHO_T}file not found" >&6
-    fi
-
-    #
-    # If the TCL_BIN_DIR is the build directory (not the install directory),
-    # then set the common variable name to the value of the build variables.
-    # For example, the variable TCL_LIB_SPEC will be set to the value
-    # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC
-    # instead of TCL_BUILD_LIB_SPEC since it will work with both an
-    # installed and uninstalled version of Tcl.
-    #
-
-    if test -f $TCL_BIN_DIR/Makefile ; then
-        TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
-        TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
-        TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
-    fi
-
-    #
-    # eval is required to do the TCL_DBGX substitution
-    #
-
-    eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
-    eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
-    eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
-
-    eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
-    eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
-    eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
     echo "$as_me:$LINENO: checking for tclsh in Tcl build directory" >&5
 echo $ECHO_N "checking for tclsh in Tcl build directory... $ECHO_C" >&6
@@ -5583,6 +5593,16 @@ s,@RC@,$RC,;t t
 s,@ac_ct_RC@,$ac_ct_RC,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@TCL_THREADS@,$TCL_THREADS,;t t
+s,@TCL_VERSION@,$TCL_VERSION,;t t
+s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t
+s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
+s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t
+s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t
+s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
+s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t
+s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t
+s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t
+s,@TCL_DEFS@,$TCL_DEFS,;t t
 s,@CYGPATH@,$CYGPATH,;t t
 s,@CELIB_DIR@,$CELIB_DIR,;t t
 s,@DL_LIBS@,$DL_LIBS,;t t
@@ -5594,16 +5614,6 @@ s,@CFLAGS_DEFAULT@,$CFLAGS_DEFAULT,;t t
 s,@LDFLAGS_DEFAULT@,$LDFLAGS_DEFAULT,;t t
 s,@VC_MANIFEST_EMBED_DLL@,$VC_MANIFEST_EMBED_DLL,;t t
 s,@VC_MANIFEST_EMBED_EXE@,$VC_MANIFEST_EMBED_EXE,;t t
-s,@TCL_VERSION@,$TCL_VERSION,;t t
-s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t
-s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
-s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t
-s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t
-s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
-s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t
-s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t
-s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t
-s,@TCL_DEFS@,$TCL_DEFS,;t t
 s,@BUILD_TCLSH@,$BUILD_TCLSH,;t t
 s,@TCLSH_PROG@,$TCLSH_PROG,;t t
 s,@TK_WIN_VERSION@,$TK_WIN_VERSION,;t t
diff --git a/win/configure.in b/win/configure.in
index 65f287a..4154945 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -75,6 +75,13 @@ SC_ENABLE_THREADS
 SC_ENABLE_SHARED
 
 #--------------------------------------------------------------------
+# Locate and source the tclConfig.sh file.
+#--------------------------------------------------------------------
+
+SC_PATH_TCLCONFIG($TK_PATCH_LEVEL)
+SC_LOAD_TCLCONFIG
+
+#--------------------------------------------------------------------
 # The statements below define a collection of compile flags.  This
 # macro depends on the value of SHARED_BUILD, and should be called
 # after SC_ENABLE_SHARED checks the configure switches.
@@ -125,13 +132,6 @@ TK_DBGX=${DBGX}
 
 SC_EMBED_MANIFEST(wish.exe.manifest)
 
-#--------------------------------------------------------------------
-# Locate and source the tclConfig.sh file.
-#--------------------------------------------------------------------
-
-SC_PATH_TCLCONFIG($TK_PATCH_LEVEL)
-SC_LOAD_TCLCONFIG
-
 SC_BUILD_TCLSH
 SC_PROG_TCLSH
 
diff --git a/win/tcl.m4 b/win/tcl.m4
index 4dbc1ce..f97992a 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -38,7 +38,6 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
 	    AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR:  perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
 	fi
 	TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd`
-	CFLAGS="$CFLAGS -mwin32"
     fi
     AC_MSG_RESULT($TCL_BIN_DIR/tclConfig.sh)
 ])
@@ -304,6 +303,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
 	DBGX=""
+	AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?])
 	AC_MSG_RESULT([no])
 
 	AC_DEFINE(TCL_CFG_OPTIMIZED)
@@ -320,12 +320,12 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
     AC_DEFINE(TCL_CFG_DEBUG)
 
     if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
-	AC_DEFINE(TCL_MEM_DEBUG)
+	AC_DEFINE(TCL_MEM_DEBUG, 1, [Is memory debugging enabled?])
     fi
 
     if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then
-	AC_DEFINE(TCL_COMPILE_DEBUG)
-	AC_DEFINE(TCL_COMPILE_STATS)
+	AC_DEFINE(TCL_COMPILE_DEBUG, 1, [Is bytecode debugging enabled?])
+	AC_DEFINE(TCL_COMPILE_STATS, 1, [Are bytecode statistics enabled?])
     fi
 
     if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then
@@ -417,6 +417,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 
     if test "$GCC" = "yes"; then
 
+      if test "$TCL_CC" = "gcc"; then
+	CFLAGS="$CFLAGS -mwin32"
+      fi
       AC_CACHE_CHECK(for cross-compile version of gcc,
 	ac_cv_cross,
 	AC_TRY_COMPILE([
diff --git a/xlib/xcolors.c b/xlib/xcolors.c
index 9e10175..87d58f9 100644
--- a/xlib/xcolors.c
+++ b/xlib/xcolors.c
@@ -17,8 +17,8 @@
  * Index array. For each of the characters 'a'-'y', this table gives the first color
  * starting with that character in the xColors table.
  */
-static unsigned char az[] = {0, 4, 12, 19, 43, 43, 46, 56, 58, 60, 60, 61, 84, 99,
-	102, 107, 118, 118, 121, 134, 138, 138, 140, 143, 143, 145};
+static unsigned char az[] = {0, 4, 12, 19, 43, 44, 47, 57, 59, 61, 62, 63, 86, 101,
+	104, 109, 120, 121, 124, 137, 141, 142, 144, 147, 148, 150};
 
 /*
  * Define an array that defines the mapping from color names to RGB values.
@@ -88,6 +88,7 @@ static const elem xColors[] = {
     "imGrey\0                     \151\151\151\0",
     "odgerBlue\0      \020\116\213\030\164\315\034\206\356\036\220\377\036\220\377\4",
     /* Colors starting with 'e' */
+    "\377" /* placeholder */,
     /* Colors starting with 'f' */
     "irebrick\0       \213\032\032\315\046\046\356\054\054\377\060\060\262\042\042\4",
     "loralWhite\0                 \377\372\360\0",
@@ -112,6 +113,7 @@ static const elem xColors[] = {
     "ndianRed\0       \213\072\072\315\125\125\356\143\143\377\152\152\315\134\134\4",
     "vory\0           \213\213\203\315\315\301\356\356\340\377\377\360\377\377\360\4",
     /* Colors starting with 'j' */
+    "\377" /* placeholder */,
     /* Colors starting with 'k' */
     "haki\0           \213\206\116\315\306\163\356\346\205\377\366\217\360\346\214\4",
     /* Colors starting with 'l' */
@@ -177,6 +179,7 @@ static const elem xColors[] = {
     "owderBlue\0                  \260\340\346\0",
     "urple\0          \125\032\213\175\046\315\221\054\356\233\060\377\240\040\360\4",
     /* Colors starting with 'q' */
+    "\377" /* placeholder */,
     /* Colors starting with 'r' */
     "ed\0             \213\000\000\315\000\000\356\000\000\377\000\000\377\000\000\4",
     "osyBrown\0       \213\151\151\315\233\233\356\264\264\377\301\301\274\217\217\4",
@@ -201,6 +204,7 @@ static const elem xColors[] = {
     "omato\0          \213\066\046\315\117\071\356\134\102\377\143\107\377\143\107\4",
     "urquoise\0       \000\206\213\000\305\315\000\345\356\000\365\377\100\340\320\4",
     /* Colors starting with 'u' */
+    "\377" /* placeholder */,
     /* Colors starting with 'v' */
     "iolet\0                      \356\202\356\0",
     "ioletRed\0       \213\042\122\315\062\170\356\072\214\377\076\226\320\040\220\4",
@@ -209,6 +213,7 @@ static const elem xColors[] = {
     "hite\0                       \377\377\377\0",
     "hiteSmoke\0                  \365\365\365\0",
     /* Colors starting with 'x' */
+    "\377" /* placeholder */,
     /* Colors starting with 'y' */
     "ellow\0          \213\213\000\315\315\000\356\356\000\377\377\000\377\377\000\4",
     "ellowGreen\0                 \232\315\062\0"