Module Name: src
Committed By: hannken
Date: Tue Jun 4 08:45:18 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/rpc: xdr.h
src/external/cddl/osnet/lib/libnvpair: Makefile
Log Message:
Use native XDR for libnvpair in userland.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/uts/common/rpc/xdr.h
cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/lib/libnvpair/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/rpc/xdr.h
diff -u src/external/cddl/osnet/dist/uts/common/rpc/xdr.h:1.4 src/external/cddl/osnet/dist/uts/common/rpc/xdr.h:1.5
--- src/external/cddl/osnet/dist/uts/common/rpc/xdr.h:1.4 Mon May 28 21:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/rpc/xdr.h Tue Jun 4 08:45:17 2019
@@ -34,6 +34,7 @@
*
*/
+#if defined(_KERNEL) || defined(_STANDALONE)
#ifndef _RPC_XDR_H
#define _RPC_XDR_H
@@ -646,3 +647,6 @@ extern bool_t xdr_replymsg_hdr(XDR *, st
#endif
#endif /* !_RPC_XDR_H */
+#else /* defined(_KERNEL) || defined(_STANDALONE) */
+#include_next <rpc/xdr.h>
+#endif /* defined(_KERNEL) || defined(_STANDALONE) */
Index: src/external/cddl/osnet/lib/libnvpair/Makefile
diff -u src/external/cddl/osnet/lib/libnvpair/Makefile:1.9 src/external/cddl/osnet/lib/libnvpair/Makefile:1.10
--- src/external/cddl/osnet/lib/libnvpair/Makefile:1.9 Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/lib/libnvpair/Makefile Tue Jun 4 08:45:17 2019
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2018/05/28 21:05:09 chs Exp $
+# $NetBSD: Makefile,v 1.10 2019/06/04 08:45:17 hannken Exp $
.include <bsd.init.mk>
.PATH: ${.CURDIR}/../../dist/lib/libnvpair
.PATH: ${.CURDIR}/../../dist/common/nvpair
-.PATH: ${.CURDIR}/../../dist/uts/common/rpc
CPPFLAGS+= -I${OSNETDIR}/sys \
-I${OPENSOLARIS_USR_DISTDIR}/head \
- -I${OPENSOLARIS_SYS_DISTDIR}/common \
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+ -I${OPENSOLARIS_SYS_DISTDIR}/common
CPPFLAGS+= -Wall \
-Wno-unknown-pragmas \
@@ -21,9 +19,6 @@ CPPFLAGS+= -Wall \
LIB= nvpair
SRCS= libnvpair.c nvpair_alloc_system.c nvpair_alloc_fixed.c nvpair.c fnvpair.c nvpair_json.c
-SRCS+= xdr.c
-SRCS+= xdr_array.c
-SRCS+= xdr_mem.c
.include "../../Makefile.zfs"
.include <bsd.lib.mk>
