From 8cc8fd69452747047304ce39efcce23f40833172 Mon Sep 17 00:00:00 2001 From: Stu Grossman Date: Mon, 16 Sep 1991 23:48:33 +0000 Subject: [PATCH] Remove o_offsetof BS. Use local def if available. --- bfd/oasys.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bfd/oasys.c b/bfd/oasys.c index 8585e22d33..2c0102eccf 100644 --- a/bfd/oasys.c +++ b/bfd/oasys.c @@ -21,9 +21,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ */ #define UNDERSCORE_HACK 1 -/* I had to prepend o_ b/c this name conflicts with a macro in - the iris 3.3 stddef.h... */ -#define o_offsetof(type, identifier) (size_t) &(((type *) 0)->identifier) #include #include @@ -158,6 +155,10 @@ DEFUN(oasys_slurp_symbol_table,(abfd), dest->section = (asection *)NULL; dest->flags = BSF_FORT_COMM; break; + default: + dest = dest_defined--; + BFD_ASSERT(0); + break; } dest->name = string_ptr; dest->the_bfd = abfd; @@ -182,7 +183,6 @@ DEFUN(oasys_slurp_symbol_table,(abfd), } } return true; - } static unsigned int @@ -876,13 +876,13 @@ DEFUN(oasys_write_syms, (abfd), oasys_write_record(abfd, oasys_record_is_local_enum, (oasys_record_union_type *) &symbol, - o_offsetof(oasys_symbol_record_type, name[0]) + l); + offsetof(oasys_symbol_record_type, name[0]) + l); } else { oasys_write_record(abfd, oasys_record_is_symbol_enum, (oasys_record_union_type *) &symbol, - o_offsetof(oasys_symbol_record_type, name[0]) + l); + offsetof(oasys_symbol_record_type, name[0]) + l); } g->value = index-1; } @@ -937,7 +937,7 @@ DEFUN(oasys_write_header, (abfd), oasys_write_record(abfd, oasys_record_is_header_enum, (oasys_record_union_type *)&r, - o_offsetof(oasys_header_record_type, description[0])); + offsetof(oasys_header_record_type, description[0])); -- 2.34.1