Touches most files in bfd/, so likely will be blamed for everything..

[deliverable/binutils-gdb.git] / bfd / libnlm.h

diff --git a/bfd/libnlm.h b/bfd/libnlm.h
index acdfcdf9128b1a38b47ad667abf9461a7ceb3b6b..4773d555ffc9074408a48b9e901b0facd99d8361 100644 (file)
--- a/bfd/libnlm.h
+++ b/bfd/libnlm.h
@@ -1,5 +1,5 @@
 /* BFD back-end data structures for NLM (NetWare Loadable Modules) files.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 2001 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 
 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.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef _LIBNLM_H_
 #define _LIBNLM_H_ 1
@@ -70,7 +70,7 @@ extern long nlmNAME(get_reloc_upper_bound)
      PARAMS ((bfd *, asection *));
 extern long nlmNAME(canonicalize_reloc)
      PARAMS ((bfd *, asection *, arelent **, asymbol **));
-extern bfd_target *nlmNAME(object_p)
+extern const bfd_target *nlmNAME(object_p)
      PARAMS ((bfd *));
 extern boolean nlmNAME(set_arch_mach)
      PARAMS ((bfd *, enum bfd_architecture, unsigned long));
@@ -91,7 +91,7 @@ struct nlm_obj_tdata
   Nlm_Internal_Copyright_Header        nlm_copyright_hdr[1];
   Nlm_Internal_Extended_Header nlm_extended_hdr[1];
   Nlm_Internal_Custom_Header   nlm_custom_hdr[1];
-  Nlm_Internal_Cygnus_Section_Header nlm_cygnus_section_hdr[1];
+  Nlm_Internal_Cygnus_Ext_Header nlm_cygnus_ext_hdr[1];
   /* BFD NLM symbols.  */
   nlmNAME(symbol_type)         *nlm_symbols;
   /* Lowest text and data VMA values.  */
@@ -123,7 +123,7 @@ struct nlm_obj_tdata
 #define nlm_copyright_header(bfd)      (nlm_tdata(bfd) -> nlm_copyright_hdr)
 #define nlm_extended_header(bfd)       (nlm_tdata(bfd) -> nlm_extended_hdr)
 #define nlm_custom_header(bfd)         (nlm_tdata(bfd) -> nlm_custom_hdr)
-#define nlm_cygnus_section_header(bfd) (nlm_tdata(bfd)->nlm_cygnus_section_hdr)
+#define nlm_cygnus_ext_header(bfd)     (nlm_tdata(bfd) -> nlm_cygnus_ext_hdr)
 #define nlm_get_symbols(bfd)           (nlm_tdata(bfd) -> nlm_symbols)
 #define nlm_set_symbols(bfd, p)                (nlm_tdata(bfd) -> nlm_symbols = (p))
 #define nlm_set_text_low(bfd, i)       (nlm_tdata(bfd) -> nlm_text_low = (i))
@@ -161,7 +161,7 @@ struct nlm_backend_data
   /* Architecture.  */
   enum bfd_architecture arch;
   /* Machine.  */
-  long mach;
+  unsigned int mach;
   /* Some NLM formats do not use the uninitialized data section, so
      all uninitialized data must be put into the regular data section
      instead.  */
@@ -169,7 +169,7 @@ struct nlm_backend_data
   /* Some NLM formats have a prefix on the file.  If this function is
      not NULL, it will be called by nlm_object_p.  It should return
      true if this file could match this format, and it should leave
-     the BFD such that a bfd_read will pick up the fixed header.  */
+     the BFD such that a bfd_bread will pick up the fixed header.  */
   boolean (*nlm_backend_object_p) PARAMS ((bfd *));
   /* Write out the prefix.  This function may be NULL.  This must
      write out the same number of bytes as is in the field