From: Alan Modra <amodra@gmail.com>
Date: Tue, 18 Sep 2001 09:59:28 +0000 (+0000)
Subject: 	* objalloc.h (OBJALLOC_ALIGN): Define using offsetof.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae81c75ec38592694a03884eb41d571733a56cd7;p=binutils-gdb.git

	* objalloc.h (OBJALLOC_ALIGN): Define using offsetof.
---

diff --git a/include/ChangeLog b/include/ChangeLog
index 6c25ae3fc92..f77ca19d104 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* objalloc.h (OBJALLOC_ALIGN): Define using offsetof.
+
 2001-09-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* libiberty.h (concat_length, concat_copy, concat_copy2,
diff --git a/include/objalloc.h b/include/objalloc.h
index 0b451cdc295..c7106478dca 100644
--- a/include/objalloc.h
+++ b/include/objalloc.h
@@ -1,5 +1,5 @@
 /* objalloc.h -- routines to allocate memory for objects
-   Copyright 1997 Free Software Foundation, Inc.
+   Copyright 1997, 2001 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Solutions.
 
 This program is free software; you can redistribute it and/or modify it
@@ -56,12 +56,11 @@ struct objalloc_align { char x; double d; };
 #ifndef offsetof
 #include <stddef.h>
 #endif
-#define OBJALLOC_ALIGN \
-  ((ptrdiff_t) ((char *) &((struct objalloc_align *) 0)->d - (char *) 0))
-#else
-#define OBJALLOC_ALIGN \
-  ((long) ((char *) &((struct objalloc_align *) 0)->d - (char *) 0))
 #endif
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+#endif
+#define OBJALLOC_ALIGN offsetof (struct objalloc_align, d)
 
 /* Create an objalloc structure.  Returns NULL if malloc fails.  */