* bfd-in.h (_bfd): Don't define.

	* bfd.c: Rename occurrences of "struct _bfd" to "struct bfd".
	* syms.c: Likewise.
	* bfd-in2.h: Regenerate.

5 files changed, 19 insertions, 18 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4fd2856cf27..0e87d08c723 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-01  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfd-in.h (_bfd): Don't define.
+	* bfd.c: Rename occurrences of "struct _bfd" to "struct bfd".
+	* syms.c: Likewise.
+	* bfd-in2.h: Regenerate.
+
 2003-02-27  Richard Henderson  <rth@redhat.com>
 
 	* elfxx-ia64.c (struct elfNN_ia64_dyn_sym_info): Add want_gotx;
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 3247e5b39a2..917b46f76f7 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -70,9 +70,6 @@ extern "C" {
 
 /* Forward declaration.  */
 typedef struct bfd bfd;
-/* For backward compatibility.  Keep code that was using "struct
-   _bfd" working.  */
-#define _bfd bfd
 
 /* Boolean type used in bfd.  Too many systems define their own
    versions of "boolean" for us to safely typedef a "boolean" of
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 46d8aab3afc..2385c409a5c 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -77,9 +77,6 @@ extern "C" {
 
 /* Forward declaration.  */
 typedef struct bfd bfd;
-/* For backward compatibility.  Keep code that was using "struct
-   _bfd" working.  */
-#define _bfd bfd
 
 /* Boolean type used in bfd.  Too many systems define their own
    versions of "boolean" for us to safely typedef a "boolean" of
@@ -3448,7 +3445,7 @@ typedef struct symbol_cache_entry
      instead, except that some symbols point to the global sections
      bfd_{abs,com,und}_section.  This could be fixed by making
      these globals be per-bfd (or per-target-flavor).  FIXME.  */
-  struct _bfd *the_bfd; /* Use bfd_asymbol_bfd(sym) to access this field.  */
+  struct bfd *the_bfd; /* Use bfd_asymbol_bfd(sym) to access this field.  */
 
   /* The text of the symbol. The name is left alone, and not copied; the
      application may not alter it.  */
@@ -3640,7 +3637,7 @@ struct bfd
 
   /* The caching routines use these to maintain a
      least-recently-used list of BFDs.  */
-  struct _bfd *lru_prev, *lru_next;
+  struct bfd *lru_prev, *lru_next;
 
   /* When a file is closed by the caching routines, BFD retains
      state information on the file here...  */
@@ -3714,13 +3711,13 @@ struct bfd
 
   /* Stuff only useful for archives.  */
   PTR arelt_data;
-  struct _bfd *my_archive;     /* The containing archive BFD.  */
-  struct _bfd *next;           /* The next BFD in the archive.  */
-  struct _bfd *archive_head;   /* The first BFD in the archive.  */
+  struct bfd *my_archive;      /* The containing archive BFD.  */
+  struct bfd *next;            /* The next BFD in the archive.  */
+  struct bfd *archive_head;    /* The first BFD in the archive.  */
   bfd_boolean has_armap;
 
   /* A chain of BFD structures involved in a link.  */
-  struct _bfd *link_next;
+  struct bfd *link_next;
 
   /* A field used by _bfd_generic_link_add_archive_symbols.  This will
      be used only for archive elements.  */
diff --git a/bfd/bfd.c b/bfd/bfd.c
index a713ad8ea1c..32250823a19 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -65,7 +65,7 @@ CODE_FRAGMENT
 .
 .  {* The caching routines use these to maintain a
 .     least-recently-used list of BFDs.  *}
-.  struct _bfd *lru_prev, *lru_next;
+.  struct bfd *lru_prev, *lru_next;
 .
 .  {* When a file is closed by the caching routines, BFD retains
 .     state information on the file here...  *}
@@ -139,13 +139,13 @@ CODE_FRAGMENT
 .
 .  {* Stuff only useful for archives.  *}
 .  PTR arelt_data;
-.  struct _bfd *my_archive;     {* The containing archive BFD.  *}
-.  struct _bfd *next;           {* The next BFD in the archive.  *}
-.  struct _bfd *archive_head;   {* The first BFD in the archive.  *}
+.  struct bfd *my_archive;      {* The containing archive BFD.  *}
+.  struct bfd *next;            {* The next BFD in the archive.  *}
+.  struct bfd *archive_head;    {* The first BFD in the archive.  *}
 .  bfd_boolean has_armap;
 .
 .  {* A chain of BFD structures involved in a link.  *}
-.  struct _bfd *link_next;
+.  struct bfd *link_next;
 .
 .  {* A field used by _bfd_generic_link_add_archive_symbols.  This will
 .     be used only for archive elements.  *}
diff --git a/bfd/syms.c b/bfd/syms.c
index d2cafd31f29..d65a8689ca7 100644
--- a/bfd/syms.c
+++ b/bfd/syms.c
@@ -192,7 +192,7 @@ CODE_FRAGMENT
 .     instead, except that some symbols point to the global sections
 .     bfd_{abs,com,und}_section.  This could be fixed by making
 .     these globals be per-bfd (or per-target-flavor).  FIXME.  *}
-.  struct _bfd *the_bfd; {* Use bfd_asymbol_bfd(sym) to access this field.  *}
+.  struct bfd *the_bfd; {* Use bfd_asymbol_bfd(sym) to access this field.  *}
 .
 .  {* The text of the symbol. The name is left alone, and not copied; the
 .     application may not alter it.  *}