diff options
| author | Gordon Ross <gwr@nexenta.com> | 2013-06-17 10:34:00 -0400 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2015-06-04 16:46:25 -0400 |
| commit | b819cea2f73f98c5662230cc9affc8cc84f77fcf (patch) | |
| tree | a3677952ded5706400717b9b79b0aeaa3d93a739 /usr/src/uts/common/sys/sysmacros.h | |
| parent | 83d2dfe69259e79314662cf95e6d1f9103dcffe2 (diff) | |
| download | illumos-joyent-b819cea2f73f98c5662230cc9affc8cc84f77fcf.tar.gz | |
5917 User-mode SMB server
Authored by: Thomas Keiser <thomas.keiser@nexenta.com>
Authored by: Albert Lee <trisk@nexenta.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Albert Lee <trisk@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/uts/common/sys/sysmacros.h')
| -rw-r--r-- | usr/src/uts/common/sys/sysmacros.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/sys/sysmacros.h b/usr/src/uts/common/sys/sysmacros.h index 71042eba85..b565968dda 100644 --- a/usr/src/uts/common/sys/sysmacros.h +++ b/usr/src/uts/common/sys/sysmacros.h @@ -26,7 +26,7 @@ * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * - * Copyright 2011, 2012 Nexenta Systems, Inc. All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #ifndef _SYS_SYSMACROS_H @@ -132,7 +132,7 @@ extern unsigned char bcd_to_byte[256]; #define getminor(x) (minor_t)((x) & L_MAXMIN) -#else +#else /* _KERNEL */ /* major part of a device external from the kernel (same as emajor below) */ @@ -367,7 +367,7 @@ extern unsigned char bcd_to_byte[256]; #endif /* _BIT_FIELDS_LTOH */ /* avoid any possibility of clashing with <stddef.h> version */ -#if defined(_KERNEL) && !defined(_KMEMUSER) +#if (defined(_KERNEL) || defined(_FAKE_KERNEL)) && !defined(_KMEMUSER) #if !defined(offsetof) #define offsetof(s, m) ((size_t)(&(((s *)0)->m))) |