diff options
| author | Toomas Soome <tsoome@me.com> | 2017-03-28 19:54:10 +0300 |
|---|---|---|
| committer | Hans Rosenfeld <hans.rosenfeld@joyent.com> | 2017-04-24 10:36:11 +0200 |
| commit | ff7af0d3beb1bddf8bb93afc2e9042dc3828be3d (patch) | |
| tree | 00d88b59ba5448b9612f490bfbf264b87b369033 /usr/src/uts/common/sys/sysmacros.h | |
| parent | 63982b82e639bf9f496423925738dd3f86bda7aa (diff) | |
| download | illumos-joyent-ff7af0d3beb1bddf8bb93afc2e9042dc3828be3d.tar.gz | |
8007 want sys/stddef.h for offsetof and container_of macros
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Yuri Pankov <yuri.pankov@gmail.com>
Approved by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
Diffstat (limited to 'usr/src/uts/common/sys/sysmacros.h')
| -rw-r--r-- | usr/src/uts/common/sys/sysmacros.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/usr/src/uts/common/sys/sysmacros.h b/usr/src/uts/common/sys/sysmacros.h index 2e895a8daf..03be89f461 100644 --- a/usr/src/uts/common/sys/sysmacros.h +++ b/usr/src/uts/common/sys/sysmacros.h @@ -33,6 +33,7 @@ #define _SYS_SYSMACROS_H #include <sys/param.h> +#include <sys/stddef.h> #ifdef __cplusplus extern "C" { @@ -369,18 +370,8 @@ extern unsigned char bcd_to_byte[256]; /* avoid any possibility of clashing with <stddef.h> version */ #if (defined(_KERNEL) || defined(_FAKE_KERNEL)) && !defined(_KMEMUSER) -#if !defined(offsetof) -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -#define offsetof(s, m) __builtin_offsetof(s, m) -#else -#define offsetof(s, m) ((size_t)(&(((s *)0)->m))) -#endif -#endif /* !offsetof */ - -#define container_of(m, s, name) \ - (void *)((uintptr_t)(m) - (uintptr_t)offsetof(s, name)) - #define ARRAY_SIZE(x) (sizeof (x) / sizeof (x[0])) + #endif /* _KERNEL, !_KMEMUSER */ #ifdef __cplusplus |