From: Arkadiusz Miskiewicz <arekm@maven.pl>
Date: Sun, 28 Nov 2010 18:28:15 +0000 (+0000)
Subject: [build] Really use __builtin_offsetof() when available
X-Git-Tag: v1.20.1~2375
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=719f2d793ced4dc22d632303f78f01f1ae64836e;p=thirdparty%2Fipxe.git

[build] Really use __builtin_offsetof() when available

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/include/stddef.h b/src/include/stddef.h
index 8e69545c2..c91a103f8 100644
--- a/src/include/stddef.h
+++ b/src/include/stddef.h
@@ -10,8 +10,8 @@ FILE_LICENCE ( GPL2_ONLY );
 #define NULL ((void *)0)
 
 #undef offsetof
-#ifdef __compiler_offsetof
-#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
+#if ( defined ( __GNUC__ ) && ( __GNUC__ > 3 ) )
+#define offsetof(TYPE, MEMBER) __builtin_offsetof(TYPE, MEMBER)
 #else
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif