1999-02-05 James Ingham <jingham@cygnus.com>

        * Makefile.in: Add GDBTK_CFLAGS - this is now used to hold
        -fwritable-strings when compiling with Tk8.1.
        * configure.in: Add GDBTK_CFLAGS, set it to -fwritable-strings for
        Tcl/Tk8.1 & greater.
        * acinclude.m4: Move the rest of the defines to find Itcl, Itk &
        Tix from aclocal.m4 to here.
        * aclocal.m4: regenerate.
        * configure: regenerate.

        * gdbtk-hooks.c (x_event): Tcl_ObjGetVar2 was removed from
        Tcl8.1.  Use Tcl_GetVar2 instead.
        * gdbtk-hooks.c (gdbtk_trace_find): Fix up call to
        Tcl_GlobalEvalObj for Tcl/Tk 8.1.
        * gdbtk-hooks.c (gdbtk_trace_start_stop): Call to Tcl_EvalObj was
        inefficient, replace with call to Tcl_GlobalEval.
        * gdbtk.c: Don't swap out the Tcl_Alloc calls in gdbtk.c.  We took
        care of that in Tcl itself for 8.1.
        * gdbtk.c: Remove const from the script string since Tcl8.1 has
        taken to scribbling sentinals into strings passed to it again...

        * gdbtk-cmds.c (wrapped_call): Change declaration of 1st arg from
        char * to PTR to eliminate warning.
        * gdbtk-cmds.c (perror_with_name_wrapper): Ditto

1 files changed, 19 insertions, 26 deletions

diff --git a/gdb/gdbtk-hooks.c b/gdb/gdbtk-hooks.c
index 2a2ffa0..4e19233 100644
--- a/gdb/gdbtk-hooks.c
+++ b/gdb/gdbtk-hooks.c
@@ -398,8 +398,12 @@ x_event (signo)
       int val;
       if (varname == NULL)
 	{
+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 1
 	  Tcl_Obj *varnamestrobj = Tcl_NewStringObj("download_cancel_ok",-1);
-	  varname = Tcl_ObjGetVar2(gdbtk_interp,varnamestrobj,NULL,TCL_GLOBAL_ONLY);
+	  varname = Tcl_ObjGetVar2(gdbtk_interp, varnamestrobj, NULL, TCL_GLOBAL_ONLY);
+#else
+	  varname = Tcl_GetObjVar2(gdbtk_interp, "download_cancel_ok", NULL, TCL_GLOBAL_ONLY);
+#endif	  
 	}
       if ((Tcl_GetIntFromObj(gdbtk_interp,varname,&val) == TCL_OK) && val)
 	{
@@ -707,17 +711,16 @@ gdbtk_trace_find (arg, from_tty)
 {
   Tcl_Obj *cmdObj;
   
-  if (from_tty) {
-    Tcl_GlobalEval (gdbtk_interp, "debug {*** In gdbtk_trace_find, from_tty is true}");
-    cmdObj = Tcl_NewListObj (0, NULL);
-    Tcl_ListObjAppendElement (gdbtk_interp, cmdObj,
-			      Tcl_NewStringObj ("gdbtk_tcl_trace_find_hook", -1));
-    Tcl_ListObjAppendElement (gdbtk_interp, cmdObj, Tcl_NewStringObj (arg, -1));
-    Tcl_ListObjAppendElement (gdbtk_interp, cmdObj, Tcl_NewIntObj(from_tty));
-    Tcl_GlobalEvalObj (gdbtk_interp, cmdObj);
-  } else {
-    Tcl_GlobalEval (gdbtk_interp, "debug {*** In gdbtk_trace_find, from_tty is false}");
-  }
+  cmdObj = Tcl_NewListObj (0, NULL);
+  Tcl_ListObjAppendElement (gdbtk_interp, cmdObj,
+			    Tcl_NewStringObj ("gdbtk_tcl_trace_find_hook", -1));
+  Tcl_ListObjAppendElement (gdbtk_interp, cmdObj, Tcl_NewStringObj (arg, -1));
+  Tcl_ListObjAppendElement (gdbtk_interp, cmdObj, Tcl_NewIntObj(from_tty));
+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 1
+  Tcl_GlobalEvalObj (gdbtk_interp, cmdObj);
+#else
+  Tcl_EvalObj (gdbtk_interp, cmdObj, TCL_EVAL_GLOBAL);
+#endif    
 }
 
 /*
@@ -734,21 +737,11 @@ gdbtk_trace_start_stop (start, from_tty)
      int start;
      int from_tty;
 {
-  Tcl_Obj *cmdObj;
   
-  if (from_tty) {
-    Tcl_GlobalEval (gdbtk_interp, "debug {*** In gdbtk_trace_start, from_tty is true}");
-    cmdObj = Tcl_NewListObj (0, NULL);
-    if (start)
-      Tcl_ListObjAppendElement (gdbtk_interp, cmdObj,
-				Tcl_NewStringObj ("gdbtk_tcl_tstart", -1));
-    else
-      Tcl_ListObjAppendElement (gdbtk_interp, cmdObj,
-				Tcl_NewStringObj ("gdbtk_tcl_tstop", -1));
-    Tcl_GlobalEvalObj (gdbtk_interp, cmdObj);
-  } else {
-    Tcl_GlobalEval (gdbtk_interp, "debug {*** In gdbtk_trace_startd, from_tty is false}");
-  }
+  if (start)
+    Tcl_GlobalEval (gdbtk_interp, "gdbtk_tcl_tstart");
+  else
+    Tcl_GlobalEval (gdbtk_interp, "gdbtk_tcl_tstop");
 
 }