From 74fb91be98e302d465b5770e0f5b661fa96d5d46 Mon Sep 17 00:00:00 2001
From: Fred Fish <fnf@specifix.com>
Date: Sat, 27 Jun 1992 19:16:47 +0000
Subject: [PATCH] 	* sparc-pinsn.c:  Use <string.h> rather than
 "string.h", for 	consistency with all other gdb files. 	* cadillac.c: 
 Use <string.h> rather than <strings.h>. 	* cadillac.c
 (kernel_dispatch):  Convert rindex usage to strrchr. 	* Makefile.in (MAKE): 
 Remove definition for consistency with 	other Makefile.in files and to
 fix problem with recursive makes.

---
 gdb/ChangeLog     | 9 +++++++++
 gdb/Makefile.in   | 1 -
 gdb/cadillac.c    | 4 ++--
 gdb/sparc-pinsn.c | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5edbc9d929..525bb8fce5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Sat Jun 27 12:12:20 1992  Fred Fish  (fnf@cygnus.com)
+
+	* sparc-pinsn.c:  Use <string.h> rather than "string.h", for
+	consistency with all other gdb files.
+	* cadillac.c:  Use <string.h> rather than <strings.h>.
+	* cadillac.c (kernel_dispatch):  Convert rindex usage to strrchr.
+	* Makefile.in (MAKE):  Remove definition for consistency with
+	other Makefile.in files and to fix problem with recursive makes.
+
 Fri Jun 26 19:03:23 1992  John Gilmore  (gnu at cygnus.com)
 
 	* hppahpux-xdep.c (child_xfer_memory):  Avoid PT_WDUSER because it
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b78657eaed..90ca97569f 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -76,7 +76,6 @@ srcdir = .
 
 BISON=yacc
 YACC=$(BISON)
-MAKE=make
 
 # Documentation (gdb.dvi) needs either GNU m4 or SysV m4; 
 # Berkeley/Sun don't have quite enough. 
diff --git a/gdb/cadillac.c b/gdb/cadillac.c
index ef9e1e8445..4f59924104 100755
--- a/gdb/cadillac.c
+++ b/gdb/cadillac.c
@@ -43,7 +43,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <signal.h>
 #include <sys/errno.h>
 #include <termios.h>
-#include <strings.h>
+#include <string.h>
 
 /* Non-zero means that we're doing the cadillac interface. */
 int cadillac = 0;
@@ -949,7 +949,7 @@ kernel_dispatch(queue)
 	    char *tail;
 	    int skipped;
 
-	    tail = rindex(req->newBreakpoint.fileName.text, '/');
+	    tail = strrchr(req->newBreakpoint.fileName.text, '/');
 	    if (!tail)
 	      tail = req->newBreakpoint.fileName.text;
 	    else
diff --git a/gdb/sparc-pinsn.c b/gdb/sparc-pinsn.c
index 231a43edf9..2b232f047d 100644
--- a/gdb/sparc-pinsn.c
+++ b/gdb/sparc-pinsn.c
@@ -21,7 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "symtab.h"
 #include "opcode/sparc.h"
 #include "gdbcore.h"
-#include "string.h"
+#include <string.h>
 #include "target.h"
 
 #define	freg_names	(&reg_names[4 * 8])
-- 
2.34.1