From b819cea2f73f98c5662230cc9affc8cc84f77fcf Mon Sep 17 00:00:00 2001 From: Gordon Ross Date: Mon, 17 Jun 2013 10:34:00 -0400 Subject: 5917 User-mode SMB server Authored by: Thomas Keiser Authored by: Albert Lee Reviewed by: Igor Kozhukhov Reviewed by: Richard Lowe Reviewed by: Albert Lee Approved by: Dan McDonald --- usr/src/uts/common/rpc/xdr.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'usr/src/uts/common/rpc') 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 /* For all ntoh* and hton*() kind of macros */ #include /* For all ntoh* and hton*() kind of macros */ -#ifndef _KERNEL +#if !defined(_KERNEL) && !defined(_FAKE_KERNEL) #include /* defines FILE *, used in ANSI C function prototypes */ -#endif -#ifdef _KERNEL +#else /* _KERNEL */ #include -#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); -- cgit v1.2.3