1999-01-19 Fernando Nasser <fnasser@totem.to.cygnus.com>

[deliverable/binutils-gdb.git] / gdb / gdbtk-hooks.c

diff --git a/gdb/gdbtk-hooks.c b/gdb/gdbtk-hooks.c
index 833edefe8859879d2408537a91b4648cc9418a0d..7bccc4f25922f2a1c150caf1500cd0e86ea6a86b 100644 (file)
--- a/gdb/gdbtk-hooks.c
+++ b/gdb/gdbtk-hooks.c
@@ -77,7 +77,7 @@ extern int  (*ui_load_progress_hook) PARAMS ((char *, unsigned long));
 extern void (*pre_add_symbol_hook) PARAMS ((char *));
 extern void (*post_add_symbol_hook) PARAMS ((void));
 extern void (*selected_frame_level_changed_hook) PARAMS ((int));
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
 extern void (*ui_loop_hook) PARAMS ((int));
 #endif
 
@@ -106,7 +106,7 @@ gdbtk_readline_begin (char *format, ...);
 gdbtk_readline_begin ();
 #endif
 static void gdbtk_readline_end PARAMS ((void));
-static void   gdbtk_flush PARAMS ((FILE *));
+static void   gdbtk_flush PARAMS ((GDB_FILE *));
 static void gdbtk_pre_add_symbol PARAMS ((char *));
 static void gdbtk_print_frame_info PARAMS ((struct symtab *, int, int, int));
 static void gdbtk_post_add_symbol PARAMS ((void));
@@ -120,7 +120,7 @@ static void gdbtk_context_change PARAMS ((int));
  * See note there for details.
  */
 
-void   gdbtk_fputs PARAMS ((const char *, FILE *));
+void   gdbtk_fputs PARAMS ((const char *, GDB_FILE *));
 int           gdbtk_load_hash PARAMS ((char *, unsigned long));
 static void   breakpoint_notify PARAMS ((struct breakpoint *, const char *));
 
@@ -151,7 +151,7 @@ gdbtk_add_hooks(void)
   target_wait_hook       = gdbtk_wait;
   ui_load_progress_hook  = gdbtk_load_hash;
 
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
   ui_loop_hook = x_event;
 #endif
   pre_add_symbol_hook    = gdbtk_pre_add_symbol;
@@ -214,7 +214,7 @@ int gdbtk_two_elem_cmd (cmd_name, argv1)
 
 static void
 gdbtk_flush (stream)
-     FILE *stream;
+     GDB_FILE *stream;
 {
 #if 0
   /* Force immediate screen update */
@@ -238,7 +238,7 @@ gdbtk_flush (stream)
  *    We place the data into the result_ptr, either as a string,
  *    or a list, depending whether the GDBTK_MAKES_LIST bit is set.
  * 3) The GDBTK_TO_RESULT flag is unset - We route the data to gdbtk_tcl_fputs
- *    UNLESS it was coming to stderr.  Then we place it in the result_ptr
+ *    UNLESS it was coming to gdb_stderr.  Then we place it in the result_ptr
  *    anyway, so it can be dealt with.
  *
  */
@@ -246,7 +246,7 @@ gdbtk_flush (stream)
 void
 gdbtk_fputs (ptr, stream)
      const char *ptr;
-     FILE *stream;
+     GDB_FILE *stream;
 {
   in_fputs = 1;
 
@@ -329,7 +329,7 @@ pc_changed()
 static void
 tk_command_loop ()
 {
-  extern GDB_FILE *instream;
+  extern FILE *instream;
 
   /* We no longer want to use stdin as the command input stream */
   instream = NULL;
@@ -369,7 +369,7 @@ x_event (signo)
 
   in_x_event = 1;
 
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
   if (signo == -2)
     gdbtk_stop_timer ();
 #endif