diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/os/freebsd/spl/sys/ccompile.h | 6 | ||||
-rw-r--r-- | include/os/freebsd/spl/sys/cmn_err.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/os/freebsd/spl/sys/ccompile.h b/include/os/freebsd/spl/sys/ccompile.h index 997044310..23e637983 100644 --- a/include/os/freebsd/spl/sys/ccompile.h +++ b/include/os/freebsd/spl/sys/ccompile.h @@ -36,12 +36,6 @@ extern "C" { #endif -#if defined(_KERNEL) || defined(_STANDALONE) -#define __NORETURN __sun_attr__((__noreturn__)) -#endif /* _KERNEL || _STANDALONE */ -#define __CONST __sun_attr__((__const__)) -#define __PURE __sun_attr__((__pure__)) - #if defined(INVARIANTS) && !defined(ZFS_DEBUG) #define ZFS_DEBUG #undef NDEBUG diff --git a/include/os/freebsd/spl/sys/cmn_err.h b/include/os/freebsd/spl/sys/cmn_err.h index bf41ecdb2..ddc2f0049 100644 --- a/include/os/freebsd/spl/sys/cmn_err.h +++ b/include/os/freebsd/spl/sys/cmn_err.h @@ -71,7 +71,7 @@ extern void vuprintf(const char *, __va_list) __attribute__((format(printf, 1, 0))); extern void panic(const char *, ...) - __attribute__((format(printf, 1, 2))) __NORETURN; + __attribute__((format(printf, 1, 2))); #endif /* !_ASM */ |