* Makefile.in (INTERNAL_CFLAGS): Include ../include as well as

[deliverable/binutils-gdb.git] / gdb / ChangeLog

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b5a6bfe5e5fe4410318017bc733789a77cd810f2..62fbdd0429119b220c2656a5e90258d93f83132b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,19 @@
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
+Thu Jun 17 17:29:30 1993  Jim Kingdon  (kingdon@lisa.cygnus.com)
+
+       * Makefile.in (INTERNAL_CFLAGS): Include ../include as well as
+       ${srcdir}/../include.
+
+       * config/m88k/xm-delta88.h: Comment out unused defines which conflict
+       with system headers.
+       * printcmd.c (printf_command): Cast second arg to vprintf to PTR.
+       Use VPRINTF macro if defined.
+       * config/m88k/xm-delta88.h: Define VPRINTF.  Include <sys/siginfo.h>.
+       Define TIOC{GETC,GLTC}_BROKEN.
+       * m88k-nat.c: Uncomment include of <sys/ptrace.h>.
+       * main.c: Rename initialize_{main,cmd_lists,history} to init_* to
+       make things easier on munch (apparently this matters on
+       the delta88 with svr3).
+
 Thu Jun 17 16:53:56 1993  david d `zoo' zuhn (zoo@cygnus.com)
        
        * Makefile.in: canonicalize install.sh; for use within
@@ -9,8 +23,6 @@ Tue Jun 15 17:01:23 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
        * Makefile.in: remove parentdir support; use INSTALL_XFORM
 
-=======
-=======
 Thu Jun 17 15:08:35 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
 
        * configure.in (alpha-*-osf*), config/alpha/alpha-osf.mh: New
@@ -22,7 +34,6 @@ Thu Jun 17 15:08:35 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
        * config/sh/tm-sh.h (REGISTER_NAMES): Know about the news ones the
        simulator defines.
 
->>>>>>> 1.1384
 Wed Jun 16 16:08:18 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
 
        * NEWS: tracking user visible changes starting with
@@ -41,7 +52,6 @@ Wed Jun 16 12:21:49 1993  Fred Fish  (fnf@cygnus.com)
        * alldeps.mak, depend:  Update to latest automatically built
        versions.
 
->>>>>>> 1.1383
 Tue Jun 15 12:26:05 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
 
        * remote-vx.c: include gdbcmd.h for setlist.