X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fliboasys.h;h=4b876abb2c04807eb90640d2de790ff25e4e3444;hb=6333bc0dd6e92dd5a76ba0a6890e08db2a6f7a29;hp=4626ab0baacb12f3ad485b4154a785e2902673bd;hpb=fa803dc60f0bf01297674c41d001798e18ade4dc;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/liboasys.h b/bfd/liboasys.h
index 4626ab0baa..4b876abb2c 100644
--- a/bfd/liboasys.h
+++ b/bfd/liboasys.h
@@ -1,24 +1,23 @@
-/* BFD internal declarations for Oasys file format handling */
-/* Scrawled by Steve Chamberlain of Cygnus Support.  */
+/* BFD internal declarations for Oasys file format handling.
+   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Scrawled by Steve Chamberlain of Cygnus Support.
 
-/* Copyright (C) 1990, 1991 Free Software Foundation, Inc.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This file is part of BFD, the Binary File Diddler.
+   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 3 of the License, or
+   (at your option) any later version.
 
-BFD 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 1, or (at your option)
-any later version.
-
-BFD is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with BFD; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
 typedef struct _oasys_symbol
 {
@@ -40,14 +39,14 @@ typedef struct _oasys_per_section
   asection *section;
   bfd_byte *data;
   bfd_vma offset;
-  boolean had_vma;
+  bfd_boolean had_vma;
   oasys_reloc_type **reloc_tail_ptr;
   bfd_vma pc;
 
 
   file_ptr current_pos;
   unsigned int current_byte;
-  boolean initialized;
+  bfd_boolean initialized;
 } oasys_per_section_type;
 
 #define NSECTIONS 10
@@ -72,7 +71,6 @@ typedef struct _oasys_ar_data {
 } oasys_ar_data_type;
 
 typedef struct _oasys_data {
-  struct obstack oasys_obstack;
   char *strings;
   asymbol *symbols;
   unsigned int symbol_string_length;
@@ -80,5 +78,6 @@ typedef struct _oasys_data {
   file_ptr first_data_record;
 } oasys_data_type;
 
-#define oasys_data(abfd) ((oasys_data_type *)((abfd)->tdata))
-#define oasys_ar_data(abfd) ((oasys_ar_data_type *)((abfd)->tdata))
+#define OASYS_DATA(abfd)	((abfd)->tdata.oasys_obj_data)
+#define OASYS_AR_DATA(abfd)	((abfd)->tdata.oasys_ar_data)
+