gas/

[deliverable/binutils-gdb.git] / bfd / coff-stgo32.c

diff --git a/bfd/coff-stgo32.c b/bfd/coff-stgo32.c
index 5c80b11b5d393275525a804718d89a1102e3b88c..b8928befa689baf15d99290a05f935196cc0caae 100644 (file)
--- a/bfd/coff-stgo32.c
+++ b/bfd/coff-stgo32.c
@@ -1,12 +1,13 @@
 /* BFD back-end for Intel 386 COFF files (DJGPP variant with a stub).
-   Copyright 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2006, 2007
+   Free Software Foundation, Inc.
    Written by Robert Hoehne.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,7 +17,8 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
 /* This file handles now also stubbed coff images. The stub is a small
    DOS executable program before the coff image to load it in memory
@@ -93,7 +95,7 @@ create_go32_stub PARAMS ((bfd *));
 #define COFF_ADJUST_AUX_OUT_PRE adjust_aux_out_pre
 #define COFF_ADJUST_AUX_OUT_POST adjust_aux_out_post
 
-static boolean
+static bfd_boolean
   go32_stubbed_coff_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
 
 #define coff_bfd_copy_private_bfd_data go32_stubbed_coff_bfd_copy_private_bfd_data
@@ -354,7 +356,7 @@ create_go32_stub (abfd)
          close (f);
          goto stub_end;
        }
-      if (memcmp (magic, "go32stub", 8) != 0)
+      if (! CONST_STRNEQ (magic, "go32stub"))
        {
          close (f);
          goto stub_end;
@@ -392,22 +394,22 @@ stub_end:
 /* If ibfd was a stubbed coff image, copy the stub from that bfd
    to the new obfd.  */
 
-static boolean
+static bfd_boolean
 go32_stubbed_coff_bfd_copy_private_bfd_data  (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
   /* Check if both are the same targets.  */
   if (ibfd->xvec != obfd->xvec)
-    return true;
+    return TRUE;
 
   /* Check if both have a valid stub.  */
   if (bfd_coff_go32stub (ibfd) == NULL
       || bfd_coff_go32stub (obfd) == NULL)
-    return true;
+    return TRUE;
 
   /* Now copy the stub.  */
   memcpy (bfd_coff_go32stub (obfd), bfd_coff_go32stub (ibfd), STUBSIZE);
 
-  return true;
+  return TRUE;
 }