* archive.c: Define offsetof here.

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

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 211445c564bca65a1cbfe9dfe14d8c5c272ce173..5a1cac124d7a60fccee0fe364f1f0f8fca7a4314 100644 (file)
--- 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 a2b072e7108fc6d9ef25f595acd94ee3ac49af72..5cc1767202e02d5e95f50046a9c6d092a2da6835 100644 (file)
--- 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 f644986a4f9a1d20c5df6579df9c4bae035f9a53..d70e25a3bec2ac96f44c97bf057395e2c3aa5b15 100644 (file)
--- 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 27580ea1384f5358dcc11bb1caf7915052a869e2..bf82c183a3aeee0f83c0bfeb9d2424d16e4f2c29 100644 (file)
--- 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 2e9f63268c7af96a1e54e699b7ee1ab991784aee..c8e7bbdd343bbe19f2b700950a5d2184cdc023be 100644 (file)
--- 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 c424a5011f3b2f752d4747d83df5fc2b5e6f246d..0760462d6867fbd14d9b03a16885d6bec4337a60 100644 (file)
--- 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 82750d48300ffc2c1be9133aae1b69f1f8938a44..08f2c898d1d6381a574cbd78f83acd7ecb1b57e1 100644 (file)
--- 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 c09968a95977e122faa5b41ed8150c883883a898..871714fd8a851a89d915a832638b0a73f021c983 100644 (file)
--- 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 5954a949422e738ada12879f58b5f0c0f403179a..ee7daeba397deb97ae68930cfd0d824520e39bfc 100644 (file)
--- 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 1f46db50cd26d91d4fb149dc335df86be09f0618..3679c80ae7877e5382b67297c09d470da019360d 100644 (file)
--- 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 4672530b6928b788902a000b4ee28d0ce1679fe3..caa7901dee809a6734457fc80ca50d0bf71db3b5 100644 (file)
--- 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 f005feff4c6afa508b684db6a70727ca93104551..5da363652c533b3c8f5bfb5740ebb6bf64ca8fad 100644 (file)
--- 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 1f46db50cd26d91d4fb149dc335df86be09f0618..3679c80ae7877e5382b67297c09d470da019360d 100644 (file)
--- 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 42f89def2d2dc545ac07964062ef77a72c9d3101..957065f6309d13e12f5132a1be2756c744fdfa19 100644 (file)
--- 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 4e3d6852889888843e60b5bb76f2ee78db93cfa3..0a17229fede19ebb9fdc0a5c37eec2d33b3e44e8 100644 (file)
--- 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 345480e21ecd9bbd2f94c40d86ef917e8d4b6adc..1f8df7612648d515932dd485eb340ef4f3108456 100644 (file)
--- 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 dfb505c0cb938cb86bcbf399e786f22e32180782..d70adea702494e8ff5ff47a872ec6639fa387739 100644 (file)
--- 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 fe3c960a5cb7fce39f4e48da3dc857f6d7a5a755..cb3f82c9223814dc1e7c0c9af689dddeff67e493 100644 (file)
--- 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 a1791c181b0afd8ddd35ef6d5354533b78a7c8c9..00b2878a8556e107a3597c879f55cdfd60971a36 100644 (file)
--- 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