From 69bdf1a5dabad362020844b56c2985875736295d Mon Sep 17 00:00:00 2001
From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Mon, 27 Sep 1993 23:27:46 +0000
Subject: [PATCH] 	* archive.c: Define offsetof here. 	* hosts/*.h:
 Don't define it here.

---
 bfd/ChangeLog         | 5 +++++
 bfd/hosts/amix.h      | 5 -----
 bfd/hosts/apollo68.h  | 5 -----
 bfd/hosts/apollov68.h | 5 -----
 bfd/hosts/delta88.h   | 5 -----
 bfd/hosts/dgux.h      | 5 -----
 bfd/hosts/harris.h    | 5 -----
 bfd/hosts/i386aix.h   | 5 -----
 bfd/hosts/i386v.h     | 5 -----
 bfd/hosts/i386v4.h    | 5 -----
 bfd/hosts/irix3.h     | 5 -----
 bfd/hosts/irix4.h     | 5 -----
 bfd/hosts/ncr3000.h   | 5 -----
 bfd/hosts/rtbsd.h     | 5 -----
 bfd/hosts/std-host.h  | 9 ---------
 bfd/hosts/stratus.h   | 5 -----
 bfd/hosts/sun3.h      | 5 -----
 bfd/hosts/ultra3.h    | 5 -----
 bfd/hosts/we32k.h     | 5 -----
 19 files changed, 5 insertions(+), 94 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 211445c564b..5a1cac124d7 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 a2b072e7108..5cc1767202e 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 f644986a4f9..d70e25a3bec 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 27580ea1384..bf82c183a3a 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 2e9f63268c7..c8e7bbdd343 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 c424a5011f3..0760462d686 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 82750d48300..08f2c898d1d 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 c09968a9597..871714fd8a8 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 5954a949422..ee7daeba397 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 1f46db50cd2..3679c80ae78 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 4672530b692..caa7901dee8 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 f005feff4c6..5da363652c5 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 1f46db50cd2..3679c80ae78 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 42f89def2d2..957065f6309 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 4e3d6852889..0a17229fede 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 345480e21ec..1f8df761264 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 dfb505c0cb9..d70adea7024 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 fe3c960a5cb..cb3f82c9223 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 a1791c181b0..00b2878a855 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
-- 
2.30.2