* archive.c: Define offsetof here.

	* hosts/*.h: Don't define it here.

19 files changed, 5 insertions, 94 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 211445c..5a1cac1 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 27 18:00:41 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* archive.c: Define offsetof here.
+	* hosts/*.h: Don't define it here.
+
 Mon Sep 27 19:09:27 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* elfcode.h (bfd_section_from_shdr): Set filepos for SHT_STRTAB
diff --git a/bfd/hosts/amix.h b/bfd/hosts/amix.h
index a2b072e..5cc1767 100644
--- a/bfd/hosts/amix.h
+++ b/bfd/hosts/amix.h
@@ -48,8 +48,3 @@ extern int fputc();
 extern int unlink();
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/apollo68.h b/bfd/hosts/apollo68.h
index f644986..d70e25a 100644
--- a/bfd/hosts/apollo68.h
+++ b/bfd/hosts/apollo68.h
@@ -25,8 +25,3 @@ extern void free	PARAMS ((PTR));
 #endif
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/apollov68.h b/bfd/hosts/apollov68.h
index 27580ea..bf82c18 100644
--- a/bfd/hosts/apollov68.h
+++ b/bfd/hosts/apollov68.h
@@ -36,8 +36,3 @@ extern void free	PARAMS ((PTR));
 #endif
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/delta88.h b/bfd/hosts/delta88.h
index 2e9f632..c8e7bbd 100644
--- a/bfd/hosts/delta88.h
+++ b/bfd/hosts/delta88.h
@@ -82,8 +82,3 @@ extern int unlink();
 
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/dgux.h b/bfd/hosts/dgux.h
index c424a50..0760462 100644
--- a/bfd/hosts/dgux.h
+++ b/bfd/hosts/dgux.h
@@ -27,8 +27,3 @@ extern int strtol();
 
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/harris.h b/bfd/hosts/harris.h
index 82750d4..08f2c89 100644
--- a/bfd/hosts/harris.h
+++ b/bfd/hosts/harris.h
@@ -24,8 +24,3 @@ extern void	bzero	PARAMS ((char *, int));
 extern int strtol();
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/i386aix.h b/bfd/hosts/i386aix.h
index c09968a..871714f 100644
--- a/bfd/hosts/i386aix.h
+++ b/bfd/hosts/i386aix.h
@@ -46,8 +46,3 @@ extern int fputc();
 extern int unlink();
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/i386v.h b/bfd/hosts/i386v.h
index 5954a94..ee7daeb 100644
--- a/bfd/hosts/i386v.h
+++ b/bfd/hosts/i386v.h
@@ -35,8 +35,3 @@ extern void free	PARAMS ((PTR));
 #endif
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/i386v4.h b/bfd/hosts/i386v4.h
index 1f46db5..3679c80 100644
--- a/bfd/hosts/i386v4.h
+++ b/bfd/hosts/i386v4.h
@@ -48,8 +48,3 @@ extern int fputc();
 extern int unlink();
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/irix3.h b/bfd/hosts/irix3.h
index 4672530..caa7901 100644
--- a/bfd/hosts/irix3.h
+++ b/bfd/hosts/irix3.h
@@ -23,8 +23,3 @@
 #endif
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/irix4.h b/bfd/hosts/irix4.h
index f005fef..5da3636 100644
--- a/bfd/hosts/irix4.h
+++ b/bfd/hosts/irix4.h
@@ -25,8 +25,3 @@
 #endif
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/ncr3000.h b/bfd/hosts/ncr3000.h
index 1f46db5..3679c80 100644
--- a/bfd/hosts/ncr3000.h
+++ b/bfd/hosts/ncr3000.h
@@ -48,8 +48,3 @@ extern int fputc();
 extern int unlink();
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/rtbsd.h b/bfd/hosts/rtbsd.h
index 42f89de..957065f 100644
--- a/bfd/hosts/rtbsd.h
+++ b/bfd/hosts/rtbsd.h
@@ -18,8 +18,3 @@ extern char     *malloc();
 extern void     free();
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/std-host.h b/bfd/hosts/std-host.h
index 4e3d685..0a17229 100644
--- a/bfd/hosts/std-host.h
+++ b/bfd/hosts/std-host.h
@@ -89,19 +89,10 @@ extern int unlink();
 #define BYTES_IN_PRINTF_INT 4
 #endif
 
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
-
 #include "fopen-same.h"
 #define hosts_std_host_H
 #endif
 
 #ifdef	STDC_HEADERS
 #include <stddef.h>
-#else
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
 #endif /* STDC_HEADERS */
diff --git a/bfd/hosts/stratus.h b/bfd/hosts/stratus.h
index 345480e..1f8df76 100644
--- a/bfd/hosts/stratus.h
+++ b/bfd/hosts/stratus.h
@@ -48,8 +48,3 @@ extern int fputc();
 extern int unlink();
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/sun3.h b/bfd/hosts/sun3.h
index dfb505c..d70adea 100644
--- a/bfd/hosts/sun3.h
+++ b/bfd/hosts/sun3.h
@@ -54,8 +54,3 @@ extern int unlink();
 
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/ultra3.h b/bfd/hosts/ultra3.h
index fe3c960..cb3f82c 100644
--- a/bfd/hosts/ultra3.h
+++ b/bfd/hosts/ultra3.h
@@ -18,8 +18,3 @@ extern char	*malloc();
 extern void	free();
 
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif
diff --git a/bfd/hosts/we32k.h b/bfd/hosts/we32k.h
index a1791c1..00b2878 100644
--- a/bfd/hosts/we32k.h
+++ b/bfd/hosts/we32k.h
@@ -26,8 +26,3 @@ extern int strtol();
 #define NO_STDARG 1
  
 #include "fopen-same.h"
-
-/* From ANSI C <stddef.h>, which we can't depend upon the existence of */
-#ifndef	offsetof
-#define	offsetof(type,memb)	((size_t)&(((type *)0)->memb))
-#endif