diff options
Diffstat (limited to 'usr/src/uts/common/sys/sysmacros.h')
| -rw-r--r-- | usr/src/uts/common/sys/sysmacros.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/uts/common/sys/sysmacros.h b/usr/src/uts/common/sys/sysmacros.h index 394a716a02..6f5882b54b 100644 --- a/usr/src/uts/common/sys/sysmacros.h +++ b/usr/src/uts/common/sys/sysmacros.h @@ -27,6 +27,8 @@ * Use is subject to license terms. * * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * + * Copyright 2018 Joyent Inc. */ #ifndef _SYS_SYSMACROS_H @@ -367,12 +369,9 @@ extern unsigned char bcd_to_byte[256]; #error One of _BIT_FIELDS_LTOH or _BIT_FIELDS_HTOL must be defined #endif /* _BIT_FIELDS_LTOH */ -/* avoid any possibility of clashing with <stddef.h> version */ -#if (defined(_KERNEL) || defined(_FAKE_KERNEL)) && !defined(_KMEMUSER) - +#if !defined(ARRAY_SIZE) #define ARRAY_SIZE(x) (sizeof (x) / sizeof (x[0])) - -#endif /* _KERNEL, !_KMEMUSER */ +#endif #ifdef __cplusplus } |