[Glibc-bsd-commits] r3179 - trunk/zfsutils/debian/patches

[Aurelien Jarno]

Author: aurel32
Date: 2010-09-01 19:03:00 +0000 (Wed, 01 Sep 2010)
New Revision: 3179

Modified:
   trunk/zfsutils/debian/patches/09_xdr_control.diff
Log:
Update previous commit to be a bit more portable


Modified: trunk/zfsutils/debian/patches/09_xdr_control.diff
===================================================================
--- trunk/zfsutils/debian/patches/09_xdr_control.diff	2010-09-01 18:58:34 UTC (rev 3178)
+++ trunk/zfsutils/debian/patches/09_xdr_control.diff	2010-09-01 19:03:00 UTC (rev 3179)
@@ -27,14 +27,20 @@
  #include <assert.h>
  
  /*
-@@ -81,9 +81,7 @@
+@@ -80,10 +80,16 @@
+ }
  
  #undef XDR_CONTROL
++#ifdef __GLIBC__
++#define	XDR_CONTROL(xdrs, req, op)					\
++	(xdrmem_control((xdrs), (req), (op)))
++
++#else
  #define	XDR_CONTROL(xdrs, req, op)					\
--	(((xdrs)->x_ops->x_control == NULL) ?				\
--	    xdrmem_control((xdrs), (req), (op)) :			\
--	    (*(xdrs)->x_ops->x_control)(xdrs, req, op))   
-+	    (xdrmem_control((xdrs), (req), (op)))
+ 	(((xdrs)->x_ops->x_control == NULL) ?				\
+ 	    xdrmem_control((xdrs), (req), (op)) :			\
+ 	    (*(xdrs)->x_ops->x_control)(xdrs, req, op))   
++#endif
  
  #endif	/* !_KERNEL */