From 2a5f387b08e8dbd8ca5d0205b5b337abb7d5c9cf Mon Sep 17 00:00:00 2001 From: John Gilmore Date: Fri, 11 Oct 1991 11:22:05 +0000 Subject: [PATCH] Include bfd.h before sysdep.h, so ansidecl and PROTO() get defined first. --- binutils/am29k-pinsn.c | 2 +- binutils/copy.c | 3 +-- binutils/cplus-dem.c | 1 + binutils/i960-pinsn.c | 6 ++---- binutils/m68k-pinsn.c | 10 ++++++---- binutils/ostrip.c | 5 ++--- binutils/sparc-pinsn.c | 53 +++----------------------------------------------- binutils/strip.c | 6 +----- 8 files changed, 17 insertions(+), 69 deletions(-) diff --git a/binutils/am29k-pinsn.c b/binutils/am29k-pinsn.c index b7a210a..a1ea0f6 100644 --- a/binutils/am29k-pinsn.c +++ b/binutils/am29k-pinsn.c @@ -25,8 +25,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ # include "target.h" # include "am29k-opcode.h" #else -# include "sysdep.h" # include "bfd.h" +# include "sysdep.h" # include "a29k-opcode.h" # define am29k_opcodes a29k_opcodes # define am29k_opcode a29k_opcode diff --git a/binutils/copy.c b/binutils/copy.c index 3abe5a6..83aba5e 100644 --- a/binutils/copy.c +++ b/binutils/copy.c @@ -1,8 +1,7 @@ /*** copy.c -- copy object file from input to output, optionally massaging it */ -#include #include "bfd.h" - +#include "sysdep.h" asymbol **sympp; char *input_target = NULL; diff --git a/binutils/cplus-dem.c b/binutils/cplus-dem.c index 4cc6496..9dcc8d5 100644 --- a/binutils/cplus-dem.c +++ b/binutils/cplus-dem.c @@ -46,6 +46,7 @@ #if 0 /* Should really be part of BFD */ #define nounderscore 1 /* define this is names don't start with _ */ #endif +#include "bfd.h" #include "sysdep.h" #include diff --git a/binutils/i960-pinsn.c b/binutils/i960-pinsn.c index 7feb54b..01cd6e2 100644 --- a/binutils/i960-pinsn.c +++ b/binutils/i960-pinsn.c @@ -19,12 +19,10 @@ You should have received a copy of the GNU General Public License along with BFD; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - $Log -*/ +/* $Id$ */ -#include "sysdep.h" #include "bfd.h" +#include "sysdep.h" extern char *xmalloc(); extern int fputs(); diff --git a/binutils/m68k-pinsn.c b/binutils/m68k-pinsn.c index 21df5d4..100cedf 100644 --- a/binutils/m68k-pinsn.c +++ b/binutils/m68k-pinsn.c @@ -20,9 +20,12 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ $Log$ - Revision 1.2 1991/06/14 22:54:44 steve - *** empty log message *** + Revision 1.3 1991/10/11 11:22:00 gnu + Include bfd.h before sysdep.h, so ansidecl and PROTO() get defined first. + * Revision 1.2 1991/06/14 22:54:44 steve + * *** empty log message *** + * * Revision 1.1.1.1 1991/03/21 21:26:46 gumby * Back from Intel with Steve * @@ -55,10 +58,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ * Initial revision * */ +#include "bfd.h" #include "sysdep.h" #include - -#include "bfd.h" #include "m68k-opcode.h" extern int fputs(); diff --git a/binutils/ostrip.c b/binutils/ostrip.c index 6ba318c..a66c76a 100755 --- a/binutils/ostrip.c +++ b/binutils/ostrip.c @@ -15,16 +15,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "bfd.h" #include "sysdep.h" +#include "getopt.h" #include #include #include #include -#include "getopt.h" -#include "bfd.h" - enum strip_action { strip_undef, strip_all, /* strip all symbols */ diff --git a/binutils/sparc-pinsn.c b/binutils/sparc-pinsn.c index dde6d58..9152269 100644 --- a/binutils/sparc-pinsn.c +++ b/binutils/sparc-pinsn.c @@ -18,58 +18,11 @@ You should have received a copy of the GNU General Public License along with the binutils; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - $Log$ - Revision 1.8 1991/06/14 22:54:48 steve - *** empty log message *** - - * Revision 1.6 1991/05/23 03:49:10 rich - * new sparc-opcode, new pinsn. - * - * Revision 1.5 1991/05/22 01:40:35 rich - * Oops. - * - * Revision 1.4 1991/05/22 01:17:48 rich - * v9 stuff. - * - * Revision 1.3 1991/05/19 08:00:57 rich - * Updated to relect a gdb change in sparc-opcode.h. - * - * Revision 1.2 1991/04/18 21:14:21 steve - * Send the right # of args to an fprintf - * - * Revision 1.1.1.1 1991/03/21 21:26:56 gumby - * Back from Intel with Steve - * - * Revision 1.1 1991/03/21 21:26:55 gumby - * Initial revision - * - * Revision 1.1 1991/03/13 00:34:40 chrisb - * Initial revision - * - * Revision 1.3 1991/03/09 04:36:31 rich - * Modified Files: - * sparc-pinsn.c ostrip.c objdump.c m68k-pinsn.c i960-pinsn.c - * binutils.h - * - * Pulled sysdep.h out of bfd.h. - * - * Revision 1.2 1991/03/08 21:54:53 rich - * Modified Files: - * Makefile ar.c binutils.h bucomm.c copy.c cplus-dem.c getopt.c - * i960-pinsn.c m68k-pinsn.c nm.c objdump.c sparc-opcode.h - * sparc-pinsn.c strip.c - * - * Verifying Portland tree with steve's last changes. Also, some partial - * porting. - * - * Revision 1.1 1991/02/22 16:48:04 sac - * Initial revision - * -*/ +/* $Id$ */ + +#include "bfd.h" #include "sysdep.h" #include -#include "bfd.h" #include "sparc-opcode.h" extern int fputs(); diff --git a/binutils/strip.c b/binutils/strip.c index 6dd2eab..79dfc2b 100755 --- a/binutils/strip.c +++ b/binutils/strip.c @@ -18,13 +18,9 @@ /* BUGS: When there's not enough memory, this should do the copy in pieces rather than just fail as it does now */ -#include "sysdep.h" #include "bfd.h" - +#include "sysdep.h" #include "getopt.h" - - - #include /* Various program options */ -- 2.7.4