From 3a757272d028834c00924c08156ca0b2dfbc6a5c Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 5 Jul 2023 07:08:32 -0500 Subject: move attribute shims There's not a great place for these, but since they are internal, we can just move them to the most common header. --- include/compat/stdint.h | 12 ++++++++++++ include/compat/sys/types.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/compat/stdint.h b/include/compat/stdint.h index 2829151..dbe3539 100644 --- a/include/compat/stdint.h +++ b/include/compat/stdint.h @@ -16,4 +16,16 @@ #include #endif +#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__bounded__) +# define __bounded__(x, y, z) +#endif + +#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead) +#ifdef _MSC_VER +#define __dead __declspec(noreturn) +#else +#define __dead __attribute__((__noreturn__)) +#endif +#endif + #endif diff --git a/include/compat/sys/types.h b/include/compat/sys/types.h index 4967843..59664bc 100644 --- a/include/compat/sys/types.h +++ b/include/compat/sys/types.h @@ -45,18 +45,6 @@ typedef SSIZE_T ssize_t; #endif -#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__bounded__) -# define __bounded__(x, y, z) -#endif - -#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead) -#ifdef _MSC_VER -#define __dead __declspec(noreturn) -#else -#define __dead __attribute__((__noreturn__)) -#endif -#endif - #ifdef _WIN32 #define __warn_references(sym,msg) #else -- cgit v1.2.3-55-g6feb