Page MenuHomeFreeBSD
Files F142724431

D54824.diff
No OneTemporary
Actions

D54824.diff
View Options

diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -129,14 +129,7 @@
* to be decoded. If this pointer is 0, then the type routines should
* allocate dynamic storage of the appropriate size and return it.
*/
-#ifdef _KERNEL
-typedef bool_t (*xdrproc_t)(XDR *, void *, u_int);
-#else
-/*
- * XXX can't actually prototype it, because some take three args!!!
- */
-typedef bool_t (*xdrproc_t)(XDR *, ...);
-#endif
+typedef bool_t (*xdrproc_t)(XDR *, void *);
/*
* Operations defined on a XDR handle
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -254,9 +254,9 @@
* structure of the data type to be decoded. If this points to 0,
* then the type routines should allocate dynamic storage of the
* appropriate size and return it.
- * bool_t (*xdrproc_t)(XDR *, caddr_t *);
+ * bool_t (*xdrproc_t)(XDR *, void *);
*/
-typedef bool_t (*xdrproc_t)();
+typedef bool_t (*xdrproc_t)(XDR *, void *);
/*
* The XDR handle.
diff --git a/sys/contrib/openzfs/module/nvpair/nvpair.c b/sys/contrib/openzfs/module/nvpair/nvpair.c
--- a/sys/contrib/openzfs/module/nvpair/nvpair.c
+++ b/sys/contrib/openzfs/module/nvpair/nvpair.c
@@ -3246,7 +3246,8 @@
* xdrproc_t-compatible callbacks for xdr_array()
*/
-#if defined(_KERNEL) && defined(__linux__) /* Linux kernel */
+#if (defined(__FreeBSD_version) && __FreeBSD_version >= 1600010) || \
+ defined(_KERNEL) && defined(__linux__) /* Linux kernel */
#define NVS_BUILD_XDRPROC_T(type) \
static bool_t \
diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h
--- a/sys/rpc/xdr.h
+++ b/sys/rpc/xdr.h
@@ -133,14 +133,7 @@
* to be decoded. If this pointer is 0, then the type routines should
* allocate dynamic storage of the appropriate size and return it.
*/
-#ifdef _KERNEL
-typedef bool_t (*xdrproc_t)(XDR *, void *, ...);
-#else
-/*
- * XXX can't actually prototype it, because some take three args!!!
- */
-typedef bool_t (*xdrproc_t)(XDR *, ...);
-#endif
+typedef bool_t (*xdrproc_t)(XDR *, void *);
/*
* Operations defined on a XDR handle
diff --git a/sys/sys/param.h b/sys/sys/param.h
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -74,7 +74,7 @@
* cannot include sys/param.h and should only be updated here.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1600009
+#define __FreeBSD_version 1600010
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 23, 5:31 PM (2 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27884868
Default Alt Text
D54824.diff (2 KB)

Event Timeline