Page MenuHomeFreeBSD
Files F107092157

D48229.id148572.diff
No OneTemporary
Actions

D48229.id148572.diff
View Options

diff --git a/sys/sys/_nv.h b/sys/sys/_nv.h
new file mode 100644
--- /dev/null
+++ b/sys/sys/_nv.h
@@ -0,0 +1,45 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2009-2013 The FreeBSD Foundation
+ *
+ * This software was developed by Pawel Jakub Dawidek under sponsorship from
+ * the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __NV_H_
+#define __NV_H_
+
+#ifndef _KERNEL
+#include <sys/nv_namespace.h>
+#endif
+
+#ifndef _NVLIST_T_DECLARED
+#define _NVLIST_T_DECLARED
+struct nvlist;
+
+typedef struct nvlist nvlist_t;
+#endif
+
+#endif /* !__NV_H_ */
diff --git a/sys/sys/cnv.h b/sys/sys/cnv.h
--- a/sys/sys/cnv.h
+++ b/sys/sys/cnv.h
@@ -30,6 +30,7 @@
#define _CNV_H_
#include <sys/cdefs.h>
+#include <sys/_nv.h>
#ifndef _KERNEL
#include <stdarg.h>
@@ -39,13 +40,6 @@
#include <sys/nv_namespace.h>
#endif
-#ifndef _NVLIST_T_DECLARED
-#define _NVLIST_T_DECLARED
-struct nvlist;
-
-typedef struct nvlist nvlist_t;
-#endif
-
__BEGIN_DECLS
/*
diff --git a/sys/sys/dnv.h b/sys/sys/dnv.h
--- a/sys/sys/dnv.h
+++ b/sys/sys/dnv.h
@@ -32,6 +32,7 @@
#define _DNV_H_
#include <sys/cdefs.h>
+#include <sys/_nv.h>
#ifndef _KERNEL
#include <stdarg.h>
@@ -41,13 +42,6 @@
#include <sys/nv_namespace.h>
#endif
-#ifndef _NVLIST_T_DECLARED
-#define _NVLIST_T_DECLARED
-struct nvlist;
-
-typedef struct nvlist nvlist_t;
-#endif
-
__BEGIN_DECLS
/*
diff --git a/sys/sys/nv.h b/sys/sys/nv.h
--- a/sys/sys/nv.h
+++ b/sys/sys/nv.h
@@ -34,6 +34,7 @@
#define _NV_H_
#include <sys/cdefs.h>
+#include <sys/_nv.h>
#ifndef _KERNEL
#include <stdarg.h>
@@ -43,13 +44,6 @@
#include <sys/nv_namespace.h>
#endif
-#ifndef _NVLIST_T_DECLARED
-#define _NVLIST_T_DECLARED
-struct nvlist;
-
-typedef struct nvlist nvlist_t;
-#endif
-
#define NV_NAME_MAX 2048
#define NV_TYPE_NONE 0
diff --git a/tools/build/Makefile b/tools/build/Makefile
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -275,6 +275,7 @@
DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h
# Needed to build config (since it uses libnv)
+SYSINCS+= ${SRCTOP}/sys/sys/_nv.h
SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \
${SRCTOP}/sys/sys/dnv.h ${SRCTOP}/sys/sys/nv_namespace.h

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 10, 11:53 PM (12 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15748073
Default Alt Text
D48229.id148572.diff (3 KB)

Event Timeline