This is the mail archive of the
binutils@sourceware.cygnus.com
mailing list for the binutils project.
Patch for multiple inclusion botch in binutils
- To: binutils at sourceware dot cygnus dot com
- Subject: Patch for multiple inclusion botch in binutils
- From: msokolov at ivan dot Harhan dot ORG (Michael Sokolov)
- Date: Thu, 13 Apr 00 14:46:02 CDT
Hi there,
The patch below fixes a multiple inclusion botch in binutils. I don't see how
it can be objectionable, can someone please check it in?
--
Michael Sokolov Harhan Engineering Laboratory
Public Service Agent International Free Computing Task Force
International Engineering and Science Task Force
615 N GOOD LATIMER EXPY STE #4
DALLAS TX 75204-5852 USA
Phone: +1-214-824-7693 (Harhan Eng Lab office)
E-mail: msokolov@ivan.Harhan.ORG (ARPA TCP/SMTP) (UUCP coming soon)
2000-04-13 Michael Sokolov <msokolov@ivan.Harhan.ORG>
* objdump.c, readelf.c: Don't include strarg.h or varargs.h. They are
already included by bucomm.h and on some systems multiple inclusion can
lead to compilation failure (it does on 4.3BSD).
Index: objdump.c
===================================================================
RCS file: /cvs/src/src/binutils/objdump.c,v
retrieving revision 1.22
diff -c -3 -p -r1.22 objdump.c
*** objdump.c 2000/04/07 04:34:50 1.22
--- objdump.c 2000/04/13 19:36:47
*************** Foundation, 59 Temple Place - Suite 330,
*** 29,40 ****
#include "debug.h"
#include "budbg.h"
- #ifdef ANSI_PROTOTYPES
- #include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
-
/* Internal headers for the ELF .stab-dump code - sorry. */
#define BYTES_IN_WORD 32
#include "aout/aout64.h"
--- 29,34 ----
Index: readelf.c
===================================================================
RCS file: /cvs/src/src/binutils/readelf.c,v
retrieving revision 1.55
diff -c -3 -p -r1.55 readelf.c
*** readelf.c 2000/04/10 17:13:07 1.55
--- readelf.c 2000/04/13 19:36:58
***************
*** 74,85 ****
#include "bucomm.h"
#include "getopt.h"
- #ifdef ANSI_PROTOTYPES
- #include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
-
char * program_name = "readelf";
unsigned int dynamic_addr;
bfd_size_type dynamic_size;
--- 74,79 ----