* symtab.c (gdb_mangle_name): Change opname var to be const to

	match return val of cplus_mangle_name.
	* i960-tdep.c:  Change arg types of next_insn to match callers.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1fd873150ad281177c2e809e1015c5266599696c..97c12b973d001ce2dcee5c5398be4c4424f2bfef 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  7 11:31:26 1996  Stu Grossman  (grossman@cygnus.com)
+
+       * symtab.c (gdb_mangle_name):  Change opname var to be const to
+       match return val of cplus_mangle_name.
+       * i960-tdep.c:  Change arg types of next_insn to match callers.
+
 Wed Feb  7 07:34:24 1996  Fred Fish  <fnf@cygnus.com>
 
        * config/i386/linux.mh (XM_CLIBS, GDBSERVER_LIBS):  Remove.  These

diff --git a/gdb/i960-tdep.c b/gdb/i960-tdep.c
index 5baa8ac34fb38c63d162fa60d2d290bf3c51bd76..081ad6f7831e708490523badf93b5e8129e94172 100644 (file)
--- a/gdb/i960-tdep.c
+++ b/gdb/i960-tdep.c
@@ -27,8 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "target.h"
 
 static CORE_ADDR next_insn PARAMS ((CORE_ADDR memaddr,
-                                   unsigned long *pword1,
-                                   unsigned long *pword2));
+                                   unsigned int *pword1,
+                                   unsigned int *pword2));
 
 /* gdb960 is always running on a non-960 host.  Check its characteristics.
    This routine must be called as part of gdb initialization.  */
@@ -710,7 +710,7 @@ mem( memaddr, word1, word2, noprint )
 
 static CORE_ADDR
 next_insn (memaddr, pword1, pword2)
-     unsigned long *pword1, *pword2;
+     unsigned int *pword1, *pword2;
      CORE_ADDR memaddr;
 {
   int len;