svn commit: r286531 - head/sys/sys

[Pedro F. Giffuni]

Author: pfg
Date: Sun Aug  9 15:38:32 2015
New Revision: 286531
URL: https://svnweb.freebsd.org/changeset/base/286531

Log:
  cdefs: reduce code duplication

Modified:
  head/sys/sys/cdefs.h

Modified: head/sys/sys/cdefs.h
==============================================================================
--- head/sys/sys/cdefs.h	Sun Aug  9 15:22:37 2015	(r286530)
+++ head/sys/sys/cdefs.h	Sun Aug  9 15:38:32 2015	(r286531)
@@ -227,16 +227,7 @@
 #define	__unused
 /* XXX Find out what to do for __packed, __aligned and __section */
 #endif
-#if __GNUC_PREREQ__(2, 7)
-#define	__dead2		__attribute__((__noreturn__))
-#define	__pure2		__attribute__((__const__))
-#define	__unused	__attribute__((__unused__))
-#define	__used		__attribute__((__used__))
-#define	__packed	__attribute__((__packed__))
-#define	__aligned(x)	__attribute__((__aligned__(x)))
-#define	__section(x)	__attribute__((__section__(x)))
-#endif
-#if defined(__INTEL_COMPILER)
+#if __GNUC_PREREQ__(2, 7) || defined(__INTEL_COMPILER)
 #define	__dead2		__attribute__((__noreturn__))
 #define	__pure2		__attribute__((__const__))
 #define	__unused	__attribute__((__unused__))