diff --git a/include/Makefile.am b/include/Makefile.am index a552026..3a5a016 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,6 +1,5 @@ noinst_HEADERS = noinst_HEADERS += machine/endian.h -noinst_HEADERS += sys/cdefs.h noinst_HEADERS += sys/queue.h noinst_HEADERS += sys/socket.h noinst_HEADERS += sys/types.h diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h deleted file mode 100644 index 3dec43d..0000000 --- a/include/sys/cdefs.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Public domain - * sys/cdefs.h compatibility shim - */ - -#include_next - -#ifndef LIBCOMPAT_SYS_CDEFS_H -#define LIBCOMPAT_SYS_CDEFS_H - -#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead) -#define __dead __attribute__((__noreturn__)) -#define __pure __attribute__((__const__)) -#endif - -#endif diff --git a/include/sys/types.h b/include/sys/types.h index 56aef0b..86821c7 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -14,6 +14,10 @@ #include <_bsd_types.h> #endif +#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead) +#define __dead __attribute__((__noreturn__)) +#endif + #if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__bounded__) # define __bounded__(x, y, z) #endif