* serial.h (SERIAL_SET_TTY_STATE): Comment return value.

[deliverable/binutils-gdb.git] / gdb / main.c

diff --git a/gdb/main.c b/gdb/main.c
index 1dafb9f03b7bdb323c165ec45ef41ce551ab2d8e..2cdabaf29b2b33b998d72a21769aa5ca933b8966 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -180,11 +180,11 @@ extern char *version;
 
 /* Canonical host name as a string. */
 
-extern char *host_canonical;
+extern char *host_name;
 
 /* Canonical target name as a string. */
 
-extern char *target_canonical;
+extern char *target_name;
 
 extern char lang_frame_mismatch_warn[];                /* language.c */
 
@@ -306,6 +306,8 @@ int linesize = 100;
 
 /* Baud rate specified for talking to serial target systems.  Default
    is left as -1, so targets can choose their own defaults.  */
+/* FIXME: This means that "show remotebaud" and gr_files_info can print -1
+   or (unsigned int)-1.  This is a Bad User Interface.  */
 
 int baud_rate = -1;
 
@@ -324,7 +326,11 @@ static void stop_sig PARAMS ((int));
 
 /* Some System V have job control but not sigsetmask(). */
 #if !defined (HAVE_SIGSETMASK)
-#define HAVE_SIGSETMASK !defined (USG)
+#if !defined (USG)
+#define HAVE_SIGSETMASK 1
+#else
+#define HAVE_SIGSETMASK 0
+#endif
 #endif
 
 #if 0 == (HAVE_SIGSETMASK)
@@ -2179,10 +2185,10 @@ print_gdb_version (stream)
   GDB_FILE *stream;
 {
   fprintf_filtered (stream, "\
-GDB %s (%s", version, host_canonical);
+GDB %s (%s", version, host_name);
 
-  if (strcmp(host_canonical, target_canonical))
-    fprintf_filtered (stream, " --target %s", target_canonical);
+  if (!STREQ (host_name, target_name))
+    fprintf_filtered (stream, " --target %s", target_name);
 
   fprintf_filtered (stream, "), ");
   wrap_here("");