[Bug 3517448] TclKit build fails (unresolved __strtoi64)

some more tkInt.decls formatting

4 files changed, 18 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 54ab679..b4ac558 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-13  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/rules.vc: [Bug 3517448] TclKit build fails (unresolved
+	__strtoi64)
+
 2012-04-07  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tkBind.c: [Bug 3176239] control-MouseWheel causes segv
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index e1f4ffc..68b8788 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -223,7 +223,7 @@ declare 57 {
     void TkpClaimFocus(TkWindow *topLevelPtr, int force)
 }
 declare 58 {
-    void TkpDisplayWarning( const char *msg, const char *title)
+    void TkpDisplayWarning(const char *msg, const char *title)
 }
 declare 59 {
     void TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name)
@@ -254,7 +254,7 @@ declare 67 {
     void TkpMenuNotifyToplevelCreate(Tcl_Interp *interp, char *menuName)
 }
 declare 68 {
-    TkDisplay *TkpOpenDisplay( const char *display_name)
+    TkDisplay *TkpOpenDisplay(const char *display_name)
 }
 declare 69 {
     int TkPointerEvent(XEvent *eventPtr, TkWindow *winPtr)
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 280e6c8..3654621 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -143,7 +143,7 @@ EXTERN CONST84_RETURN char * TkGetDefaultScreenName _ANSI_ARGS_((
 EXTERN TkDisplay *	TkGetDisplay _ANSI_ARGS_((Display *display));
 /* 35 */
 EXTERN int		TkGetDisplayOf _ANSI_ARGS_((Tcl_Interp *interp,
-				int objc, Tcl_Obj * CONST objv[],
+				int objc, Tcl_Obj *CONST objv[],
 				Tk_Window *tkwinPtr));
 /* 36 */
 EXTERN TkWindow *	TkGetFocusWin _ANSI_ARGS_((TkWindow *winPtr));
@@ -235,7 +235,7 @@ EXTERN Window		TkpMakeWindow _ANSI_ARGS_((TkWindow *winPtr,
 				Window parent));
 /* 67 */
 EXTERN void		TkpMenuNotifyToplevelCreate _ANSI_ARGS_((
-				Tcl_Interp *interp1, char *menuName));
+				Tcl_Interp *interp, char *menuName));
 /* 68 */
 EXTERN TkDisplay *	TkpOpenDisplay _ANSI_ARGS_((CONST char *display_name));
 /* 69 */
@@ -602,7 +602,7 @@ typedef struct TkIntStubs {
     TkCursor * (*tkGetCursorByName) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid string)); /* 32 */
     CONST84_RETURN char * (*tkGetDefaultScreenName) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *screenName)); /* 33 */
     TkDisplay * (*tkGetDisplay) _ANSI_ARGS_((Display *display)); /* 34 */
-    int (*tkGetDisplayOf) _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[], Tk_Window *tkwinPtr)); /* 35 */
+    int (*tkGetDisplayOf) _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Tk_Window *tkwinPtr)); /* 35 */
     TkWindow * (*tkGetFocusWin) _ANSI_ARGS_((TkWindow *winPtr)); /* 36 */
     int (*tkGetInterpNames) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin)); /* 37 */
     int (*tkGetMiterPoints) _ANSI_ARGS_((double p1[], double p2[], double p3[], double width, double m1[], double m2[])); /* 38 */
@@ -634,7 +634,7 @@ typedef struct TkIntStubs {
     void (*tkpMakeContainer) _ANSI_ARGS_((Tk_Window tkwin)); /* 64 */
     void (*tkpMakeMenuWindow) _ANSI_ARGS_((Tk_Window tkwin, int transient)); /* 65 */
     Window (*tkpMakeWindow) _ANSI_ARGS_((TkWindow *winPtr, Window parent)); /* 66 */
-    void (*tkpMenuNotifyToplevelCreate) _ANSI_ARGS_((Tcl_Interp *interp1, char *menuName)); /* 67 */
+    void (*tkpMenuNotifyToplevelCreate) _ANSI_ARGS_((Tcl_Interp *interp, char *menuName)); /* 67 */
     TkDisplay * (*tkpOpenDisplay) _ANSI_ARGS_((CONST char *display_name)); /* 68 */
     int (*tkPointerEvent) _ANSI_ARGS_((XEvent *eventPtr, TkWindow *winPtr)); /* 69 */
     int (*tkPolygonToArea) _ANSI_ARGS_((double *polyPtr, int numPoints, double *rectPtr)); /* 70 */
diff --git a/win/rules.vc b/win/rules.vc
index b813668..69f9fc8 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -426,18 +426,21 @@ OPTDEFINES	= $(OPTDEFINES) -DUSE_THREAD_ALLOC=1
 OPTDEFINES	= $(OPTDEFINES) -DSTATIC_BUILD
 !endif
 
-!if $(DEBUG)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DEBUG
-!elseif $(OPTIMIZING)
+!if !$(DEBUG)
+OPTDEFINES	= $(OPTDEFINES) -DNDEBUG
+!if $(OPTIMIZING)
 OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_OPTIMIZED
 !endif
+!endif
 !if $(PROFILE)
 OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_PROFILED
 !endif
 !if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
 OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DO64BIT
 !endif
-
+!if $(VCVERSION) < 1300
+OPTDEFINES	= $(OPTDEFINES) -DNO_STRTOI64
+!endif
 
 #----------------------------------------------------------
 # Get common info used when building extensions.