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/rpc | |
| 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/rpc')
| -rw-r--r-- | usr/src/uts/common/rpc/xdr.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr/src/uts/common/rpc/xdr.h b/usr/src/uts/common/rpc/xdr.h index 3db775893c..ebdd448d48 100644 --- a/usr/src/uts/common/rpc/xdr.h +++ b/usr/src/uts/common/rpc/xdr.h @@ -20,6 +20,8 @@ * * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ @@ -39,12 +41,11 @@ #include <sys/byteorder.h> /* For all ntoh* and hton*() kind of macros */ #include <rpc/types.h> /* For all ntoh* and hton*() kind of macros */ -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(_FAKE_KERNEL) #include <stdio.h> /* defines FILE *, used in ANSI C function prototypes */ -#endif -#ifdef _KERNEL +#else /* _KERNEL */ #include <sys/stream.h> -#endif +#endif /* _KERNEL */ #ifdef __cplusplus extern "C" { @@ -557,7 +558,7 @@ typedef struct xdr_bytesrec xdr_bytesrec; * These are the public routines for the various implementations of * xdr streams. */ -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(_FAKE_KERNEL) #ifdef __STDC__ extern void xdrmem_create(XDR *, const caddr_t, const uint_t, const enum xdr_op); |