From 2a80af91ed03a79605d41c0e5ece7906b4d747e4 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 18 May 2010 12:47:08 -0700 Subject: [PATCH] Remove nvpair_alloc_system.c change in libspl topic branch. A change to the nvpair implementation should not have been made in the libspl-topic branch. This patch fixes that accident by reverting the change and providing the missing libspl header to allow the proper building of nvpair_alloc_system.c without the need to modify it. --- lib/libnvpair/nvpair_alloc_system.c | 2 +- lib/libspl/include/rpc/types.h | 32 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 lib/libspl/include/rpc/types.h diff --git a/lib/libnvpair/nvpair_alloc_system.c b/lib/libnvpair/nvpair_alloc_system.c index af30c1f409..f45dc5f0b9 100644 --- a/lib/libnvpair/nvpair_alloc_system.c +++ b/lib/libnvpair/nvpair_alloc_system.c @@ -26,7 +26,7 @@ -#include +#include #include static void * diff --git a/lib/libspl/include/rpc/types.h b/lib/libspl/include/rpc/types.h new file mode 100644 index 0000000000..68c17f103b --- /dev/null +++ b/lib/libspl/include/rpc/types.h @@ -0,0 +1,32 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#ifndef LIBSPL_RPC_TYPES_H +#define LIBSPL_RPC_TYPES_H + +#include_next +#include + +#endif /* LIBSPL_RPC_TYPES_H */