From f004165ea50e6515128729bcbfe3a12db1e0a627 Mon Sep 17 00:00:00 2001
From: John Gilmore <gnu@cygnus>
Date: Fri, 4 Oct 1991 02:49:06 +0000
Subject: [PATCH] * bfd-in.h:  enum boolean => enum bfd_boolean for SVR4. 
 Gumby's prediction is vindicated!

* bfd-in.h, libbfd-in.h, doc/Makefile, doc/tolibbfd, doc/intobfd:
Remove refs to howto.c, since Steve forgot.
---
 bfd/ChangeLog   | 8 ++++++++
 bfd/bfd-in.h    | 7 ++++---
 bfd/libbfd-in.h | 3 ---
 bfd/libbfd.h    | 3 ---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5ef7aa2..a02663a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+Thu Oct  3 19:39:55 1991  John Gilmore  (gnu at cygnus.com)
+
+	* bfd-in.h:  enum boolean => enum bfd_boolean for SVR4.  Gumby's
+	prediction is vindicated!
+
+	* bfd-in.h, libbfd-in.h, doc/Makefile, doc/tolibbfd, doc/intobfd:
+	Remove refs to howto.c, since Steve forgot.
+
 Thu Oct  3 07:49:21 1991  Steve Chamberlain  (steve at cygnus.com)
 
 	* elf.c: took the abort out of set_arch_mach so that objdump -i will
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index d674618..fbbecd4 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -52,7 +52,7 @@ here.  */
 #	endif
 #endif
 
-#define BFD_VERSION "1.15"
+#define BFD_VERSION "0.18"
 
 /* forward declaration */
 typedef struct _bfd bfd;
@@ -61,7 +61,9 @@ typedef struct _bfd bfd;
    and false on failure (unless they're a predicate).   -- bfd.doc */
 /* I'm sure this is going to break something and someone is going to
    force me to change it. */
-typedef enum boolean {false, true} boolean;
+/* typedef enum boolean {false, true} boolean; */
+/* Yup, SVR4 has a "typedef enum boolean" in <sys/types.h>  -fnf */
+typedef enum bfd_boolean {false, true} boolean;
 
 /* Try to avoid breaking stuff */
 typedef  long int file_ptr;
@@ -323,7 +325,6 @@ extern CONST short _bfd_host_big_endian;
 
 /*:archures.c*/
 
-/*:howto.c*/
 /*:reloc.c*/
 
 /*:syms.c*/
diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h
index 9932071..57d8f7e 100644
--- a/bfd/libbfd-in.h
+++ b/bfd/libbfd-in.h
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $Id$ */
 
 /* If you want to read and write large blocks, you might want to do it
    in quanta of this amount */
@@ -194,7 +193,5 @@ extern bfd *bfd_last_cache;
 
 /*:cpu-empty.c*/
 
-/*:howto.c*/
-
 /*:archures.c*/
 
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 0c3ad59..c358a9b 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $Id$ */
 
 /* If you want to read and write large blocks, you might want to do it
    in quanta of this amount */
@@ -280,8 +279,6 @@ one first, to avoid running out of file descriptors.
 
 /*:cpu-empty.c*/
 
-/*:howto.c*/
-
 /*:archures.c*/
 /* bfd_default_arch_struct
 
-- 
2.7.4