2000-12-03 Kazu Hirata <kazu@hxi.com>

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

diff --git a/bfd/liboasys.h b/bfd/liboasys.h
index 4626ab0baacb12f3ad485b4154a785e2902673bd..7f7ea59b5a7b188d8e6de6b922ac9fdcb7c14acd 100644 (file)
--- a/bfd/liboasys.h
+++ b/bfd/liboasys.h
@@ -1,24 +1,22 @@
-/* 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, 91, 92, 93, 94, 95, 1997 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.
-
-BFD is free software; you can redistribute it and/or modify
+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 1, or (at your option)
-any later version.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-BFD is distributed in the hope that it will be useful,
+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 BFD; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 typedef struct _oasys_symbol
 {
@@ -72,7 +70,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 +77,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)
+