2002-03-27 Daniel Jacobowitz <drow@mvista.com>

        * signals/signals.c: Include "server.h" in gdbserver build.
        (target_signal_from_name): Don't use STREQ.
        (_initialize_signals): Likewise.  Don't include function in
        gdbserver build.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9d6eea654099eaca8125bf460091141f88231cf0..e442c303cd968c76635fd86a83619905087731bd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-27  Daniel Jacobowitz  <drow@mvista.com>
+
+       * signals/signals.c: Include "server.h" in gdbserver build.
+       (target_signal_from_name): Don't use STREQ.
+       (_initialize_signals): Likewise.  Don't include function in
+       gdbserver build.
+
 2002-03-27  Daniel Jacobowitz  <drow@mvista.com>
 
        * signals.c: Moved to...

diff --git a/gdb/signals/signals.c b/gdb/signals/signals.c
index d37ec06ee9ae4858d91a8af0f2b796b784877d6e..774d70ab84e54c5d02e22976779c8cc5d92533be 100644 (file)
--- a/gdb/signals/signals.c
+++ b/gdb/signals/signals.c
@@ -1,6 +1,6 @@
 /* Target signal translation functions for GDB.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001 Free Software Foundation, Inc.
+   2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
    This file is part of GDB.
@@ -20,8 +20,13 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifdef GDBSERVER
+#include "server.h"
+#else
 #include "defs.h"
 #include "target.h"
+#endif
+
 #include <signal.h>
 
 /* This table must match in order and size the signals in enum target_signal
@@ -234,7 +239,7 @@ target_signal_from_name (char *name)
   for (sig = TARGET_SIGNAL_HUP;
        signals[sig].name != NULL;
        sig = (enum target_signal) ((int) sig + 1))
-    if (STREQ (name, signals[sig].name))
+    if (strcmp (name, signals[sig].name) == 0)
       return sig;
   return TARGET_SIGNAL_UNKNOWN;
 }
@@ -829,9 +834,11 @@ target_signal_from_command (int num)
 Use \"info signals\" for a list of symbolic signals.");
 }
 
+#ifndef GDBSERVER
 void
 _initialize_signals (void)
 {
-  if (!STREQ (signals[TARGET_SIGNAL_LAST].string, "TARGET_SIGNAL_MAGIC"))
+  if (strcmp (signals[TARGET_SIGNAL_LAST].string, "TARGET_SIGNAL_MAGIC") != 0)
     internal_error (__FILE__, __LINE__, "failed internal consistency check");
 }
+#endif