1999-01-27 James Ingham <jingham@cygnus.com>

	* gdbtk-wrapper.c: Missed a couple of places where FILE->GDB_FILE
	in the fputs_unfiltered_hook needed to propagate.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4b1fb9b1037df86e88ff3557eed5cb3b9759bf36..1ddf58ed8d51162064321c87e10f9f163c7110f0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,7 +1,5 @@
 1999-01-27  James Ingham  <jingham@cygnus.com>
 
-       Merging changes in from gdbtk-980810-branch:
-
        * typeprint.c (whatis_exp): Remove static declaration.
 
 Wed Jan 27 16:50:25 1999  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>

diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk
index 55d8255b260bd4efea91cb224e3e93ed872c4b48..5d0130868c75d8c85c8474e5b2c4dcd44cec1758 100644 (file)
--- a/gdb/ChangeLog-gdbtk
+++ b/gdb/ChangeLog-gdbtk
@@ -1,4 +1,9 @@
-M1999-01-27  James Ingham  <jingham@cygnus.com>
+1999-01-27  James Ingham  <jingham@cygnus.com>
+
+       * gdbtk-wrapper.c: Missed a couple of places where FILE->GDB_FILE
+       in the fputs_unfiltered_hook needed to propagate.
+
+1999-01-27  James Ingham  <jingham@cygnus.com>
 
        Merging in changes from gdbtk-980810 - the Itcl3
        gdb branch.

diff --git a/gdb/gdbtk-variable.c b/gdb/gdbtk-variable.c
index 9ed6a109f4d5362a51c0dfca6ea2a5d16a805085..5a3220d63f392a1d0af2db65beaf0c93a1b4f6bd 100644 (file)
--- a/gdb/gdbtk-variable.c
+++ b/gdb/gdbtk-variable.c
@@ -199,9 +199,9 @@ static int call_gdb_type_print PARAMS ((value_ptr));
 
 static int call_gdb_val_print PARAMS ((value_ptr, int));
 
-static void variable_fputs PARAMS ((const char *, FILE *));
+static void variable_fputs PARAMS ((const char *, GDB_FILE *));
 
-static void null_fputs PARAMS ((const char *, FILE *));
+static void null_fputs PARAMS ((const char *, GDB_FILE *));
 
 static int my_value_equal PARAMS ((gdb_variable *, value_ptr));
 
@@ -528,7 +528,7 @@ create_variable (name, real_name, pc)
   value_ptr mark;
   struct frame_info *fi, *old_fi;
   struct block *block;
-  void (*old_fputs) PARAMS ((const char *, FILE *));
+  void (*old_fputs) PARAMS ((const char *, GDB_FILE *));
   gdb_result r;
 
   var  = (gdb_variable *) xmalloc (sizeof (gdb_variable));
@@ -1446,7 +1446,7 @@ static int
 call_gdb_type_print (val)
      value_ptr val;
 {
-  void (*old_hook) PARAMS ((const char *, FILE *));
+  void (*old_hook) PARAMS ((const char *, GDB_FILE *));
   int result;
 
   /* Save the old hook and install new hook */
@@ -1474,7 +1474,7 @@ call_gdb_val_print (val, format)
      value_ptr val;
      int format;
 {
-  void (*old_hook) PARAMS ((const char *, FILE *));
+  void (*old_hook) PARAMS ((const char *, GDB_FILE *));
   gdb_result r;
   int result;
 
@@ -1512,7 +1512,7 @@ call_gdb_val_print (val, format)
 static void
 variable_fputs (text, stream)
      const char *text;
-     FILE *stream;
+     GDB_FILE *stream;
 {
   /* Just append everything to the fputs_obj... Issues with stderr/stdout? */
   Tcl_AppendToObj (fputs_obj, (char *) text, -1);
@@ -1523,7 +1523,7 @@ variable_fputs (text, stream)
 static void
 null_fputs (text, stream)
      const char *text;
-     FILE *stream;
+     GDB_FILE *stream;
 {
   return;
 }