From: Daniel Jacobowitz <drow@false.org>
Date: Fri, 29 Mar 2002 18:44:22 +0000 (+0000)
Subject: 2002-03-29  Daniel Jacobowitz  <drow@mvista.com>
X-Git-Tag: gdb_5_2-2002-04-29-release~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c94a5097d06d3672c400b454bf9c2653169b794;p=thirdparty%2Fbinutils-gdb.git

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

        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 a5deecd9fcd..0fcdf1575d6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-29  Daniel Jacobowitz  <drow@mvista.com>
+
+	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-29  Daniel Jacobowitz  <drow@mvista.com>
 
 	Merge from trunk:
diff --git a/gdb/signals/signals.c b/gdb/signals/signals.c
index d37ec06ee9a..774d70ab84e 100644
--- 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