diff options
| author | Jeff Darcy <jdarcy@fb.com> | 2017-07-06 08:52:44 -0700 |
|---|---|---|
| committer | Jeff Darcy <jeff@pl.atyp.us> | 2017-07-06 19:05:23 +0000 |
| commit | fb4445816a9775daf32b590d0158ef0271c2c866 (patch) | |
| tree | 9fa49e45b59d3b05e207a69ddfd69c9a5e9a5304 /rpc/rpc-lib/src | |
| parent | b6e84d469993ceff1c0d6f3201cbcecdfa17eb06 (diff) | |
Build/test fixes - build_env, tirpc, mem-pool, cleanup
Differential Revision: https://phabricator.intern.facebook.com/D5376801
Change-Id: I5bf733a395ef2b85065200fa5810ced27ee0d682
Reviewed-on: https://review.gluster.org/17719
Smoke: Gluster Build System <jenkins@build.gluster.org>
Tested-by: Jeff Darcy <jeff@pl.atyp.us>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
Diffstat (limited to 'rpc/rpc-lib/src')
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt.c | 2 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpcsvc.c | 2 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/xdr-common.h | 7 |
3 files changed, 11 insertions, 0 deletions
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index be18ed9f305..014b2a25d11 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -21,6 +21,8 @@ #include "xdr-rpc.h" #include "rpc-common-xdr.h" +#pragma GCC diagnostic ignored "-Wformat=" + void rpc_clnt_reply_deinit (struct rpc_req *req, struct mem_pool *pool); diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c index ed23f547e53..87a918ce8cb 100644 --- a/rpc/rpc-lib/src/rpcsvc.c +++ b/rpc/rpc-lib/src/rpcsvc.c @@ -44,6 +44,8 @@ #include "xdr-rpcclnt.h" #include "glusterfs-acl.h" +#pragma GCC diagnostic ignored "-Wformat=" + struct rpcsvc_program gluster_dump_prog; #define rpcsvc_alloc_request(svc, request) \ diff --git a/rpc/rpc-lib/src/xdr-common.h b/rpc/rpc-lib/src/xdr-common.h index 596ac99640f..211e33272ba 100644 --- a/rpc/rpc-lib/src/xdr-common.h +++ b/rpc/rpc-lib/src/xdr-common.h @@ -105,4 +105,11 @@ unsigned long xdr_sizeof (xdrproc_t func, void *data); #define xdr_decoded_length(xdr) (((size_t)(&xdr)->x_private) - ((size_t)(&xdr)->x_base)) +/* + * The TIRPC headers rather annoyingly don't define this, even though it + * actually exists. + */ +extern u_long xdr_sizeof (xdrproc_t freebsd_compiler_is_broken, + void *so_is_net_bsd); + #endif |