From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Sun, 7 Oct 2012 23:39:37 +0000 (-0700)
Subject: build - Unbreak world
X-Git-Tag: v3.2.0~6
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/7f32c88b6c6c84a79453c827d74ffe84f7199b7a

build - Unbreak world

* Fix issue w/ last commit

Submitted-by: marino
---

diff --git a/sys/cpu/i386/include/stdint.h b/sys/cpu/i386/include/stdint.h
index 60e5e30..8b5cada 100644
--- a/sys/cpu/i386/include/stdint.h
+++ b/sys/cpu/i386/include/stdint.h
@@ -116,7 +116,7 @@ typedef volatile int	__atomic_intr_t;
 /*
  * Its convenient to put these here rather then create another header file.
  */
-#if __GNUC_PREREQ__(4, 1)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
 #define __offsetof(type, field) __builtin_offsetof(type, field)
 #else
 #ifndef __cplusplus
diff --git a/sys/cpu/x86_64/include/stdint.h b/sys/cpu/x86_64/include/stdint.h
index dabdc74..6e83d25 100644
--- a/sys/cpu/x86_64/include/stdint.h
+++ b/sys/cpu/x86_64/include/stdint.h
@@ -132,7 +132,7 @@ typedef volatile int	__atomic_intr_t;
 /*
  * Its convenient to put these here rather then create another header file.
  */
-#if __GNUC_PREREQ__(4, 1)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
 #define __offsetof(type, field) __builtin_offsetof(type, field)
 #else
 #ifndef __cplusplus