[ruby-dev:21750] Re: ruby 1.8.1 preview1 schedule

こんにちは、なかむら(う)です。

In message "[ruby-dev:21747] ruby 1.8.1 preview1 schedule"
    on Oct.29,2003 15:56:08, <[e-mail]> wrote:
| コミットしたいが決めかねている人は議論を始めてください。

Tclが8.3以下のとき、ext/tcltklibで怒られるような気がします。
# 私のせいかもしれません

手元の8.3・8.4のtcl.hを眺めた感じでは、以下のようにするとよい
のではないと思うのですが、どうでしょう?

Index: ext/tcltklib/tcltklib.c
===================================================================
RCS file: /home/cvs/ruby/ext/tcltklib/tcltklib.c,v
retrieving revision 1.44
diff -u -1 -p -w -r1.44 tcltklib.c
--- ext/tcltklib/tcltklib.c	28 Oct 2003 06:23:47 -0000	1.44
+++ ext/tcltklib/tcltklib.c	29 Oct 2003 07:46:12 -0000
@@ -26,2 +26,16 @@
 
+#if TCL_MAJOR_VERSION >= 8
+# ifndef CONST84
+#  if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 4 /* Tcl8.0.x -- 8.4b1 */
+#   define CONST84
+#  else /* unknown (maybe TCL_VERSION >= 8.5) */
+#   ifdef CONST
+#    define CONST84 CONST
+#   else
+#    define CONST84
+#   endif
+#  endif
+# endif
+#endif
+
 /* for ruby_debug */
@@ -864,4 +878,4 @@ ip_ruby(clientData, interp, argc, argv)
 /**************************/
-static char *VwaitVarProc _((ClientData, Tcl_Interp *, CONST char *,
-			     CONST char *, int));
+static char *VwaitVarProc _((ClientData, Tcl_Interp *, CONST84 char *,
+			     CONST84 char *, int));
 static char *
@@ -870,4 +884,4 @@ VwaitVarProc(clientData, interp, name1, 
     Tcl_Interp *interp;         /* Interpreter containing variable. */
-    CONST char *name1;          /* Name of variable. */
-    CONST char *name2;          /* Second part of variable name. */
+    CONST84 char *name1;        /* Name of variable. */
+    CONST84 char *name2;        /* Second part of variable name. */
     int flags;                  /* Information about what happened. */
@@ -955,4 +969,4 @@ ip_rbVwaitCommand(clientData, interp, ob
 /**************************/
-static char *WaitVariableProc _((ClientData, Tcl_Interp *, CONST char *,
-				 CONST char *, int));
+static char *WaitVariableProc _((ClientData, Tcl_Interp *, CONST84 char *,
+				 CONST84 char *, int));
 static char *
@@ -961,4 +975,4 @@ WaitVariableProc(clientData, interp, nam
     Tcl_Interp *interp;         /* Interpreter containing variable. */
-    CONST char *name1;          /* Name of variable. */
-    CONST char *name2;          /* Second part of variable name. */
+    CONST84 char *name1;        /* Name of variable. */
+    CONST84 char *name2;        /* Second part of variable name. */
     int flags;                  /* Information about what happened. */
@@ -1049,15 +1063,3 @@ ip_rbTkWaitCommand(clientData, interp, o
     if (Tcl_GetIndexFromObj(interp, objv[1], 
-# ifdef CONST84 /* Tcl8.4.x -- ?.?.? (current latest version is 8.4.4) */
                             (CONST84 char **)optionStrings, 
-# else
-#  if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 4 /* Tcl8.0.x -- 8.4b1 */
-                            (char **)optionStrings, 
-#  else /* unknown (maybe TCL_VERSION >= 8.5) */
-#   ifdef CONST
-                            (CONST char **)optionStrings, 
-#   else
-                            optionStrings, 
-#   endif
-#  endif
-# endif
 			    "option", 0, &index) != TCL_OK) {
@@ -1175,4 +1177,4 @@ struct th_vwait_param {
 
-static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *, CONST char *,
-				   CONST char *, int));
+static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *, CONST84 char *,
+				   CONST84 char *, int));
 static char *
@@ -1181,4 +1183,4 @@ rb_threadVwaitProc(clientData, interp, n
     Tcl_Interp *interp;         /* Interpreter containing variable. */
-    CONST char *name1;          /* Name of variable. */
-    CONST char *name2;          /* Second part of variable name. */
+    CONST84 char *name1;        /* Name of variable. */
+    CONST84 char *name2;        /* Second part of variable name. */
     int flags;                  /* Information about what happened. */
@@ -1364,15 +1366,3 @@ ip_rb_threadTkWaitCommand(clientData, in
     if (Tcl_GetIndexFromObj(interp, objv[1], 
-# ifdef CONST84 /* Tcl8.4.x -- ?.?.? (current latest version is 8.4.4) */
                             (CONST84 char **)optionStrings, 
-# else
-#  if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 4 /* Tcl8.0.x -- 8.4b1 */
-                            (char **)optionStrings, 
-#  else /* unknown (maybe TCL_VERSION >= 8.5) */
-#   ifdef CONST
-                            (CONST char **)optionStrings, 
-#   else
-                            optionStrings, 
-#   endif
-#  endif
-# endif
 			    "option", 0, &index) != TCL_OK) {
@@ -1980,18 +1970,4 @@ ip_invoke_real(argc, argv, obj)
 #if TCL_MAJOR_VERSION >= 8
-# ifdef CONST84 /* Tcl8.4.x -- ?.?.? (current latest version is 8.4.4) */
 	ptr->return_value = (*info.proc)(info.clientData, ptr->ip, 
 					 argc, (CONST84 char **)av);
-# else
-#  if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 4 /* Tcl8.0.x -- 8.4b1 */
-	ptr->return_value = (*info.proc)(info.clientData, ptr->ip, argc, av);
-
-#  else /* unknown (maybe TCL_VERSION >= 8.5) */
-#   ifdef CONST
-	ptr->return_value = (*info.proc)(info.clientData, ptr->ip, 
-					 argc, (CONST char **)av);
-#   else
-	ptr->return_value = (*info.proc)(info.clientData, ptr->ip, argc, av);
-#   endif
-#  endif
-# endif
 #else /* TCL_MAJOR_VERSION < 8 */

それでは。
-- 
U.Nakamura <[e-mail]>