From 2f945b86d30eca3a32f5e8e42fbe692ddf4b55be Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 18 Apr 2016 21:47:18 +0200 Subject: rpc: split FOPs enum from glusterfs.h Moving the enumeration of FOPs and some of the other parts that are defining the network protocol to the rpc/xdr/ section. These structures need some care when modifications are made, moving them out of the common glusterfs.h header helps with that. The protocol definition structures are generated in a new glusterfs-fops header. This file is present in rpc/xdr/src/ and libglusterfs/src/, it is a little ugly, but prevents the need to update all Makefile.am files with the additional -I option for finding the new header file. The generation of the .c and .h files from the .x descriptions needed small modifications to accommodate these changes. The build/xdrgen script was improved slightly for this. The .c and .h files are incorrectly in the $(top_srcdir), instead of $(top_builddir). This is an existing issue, and bug 1330604 has been filed to get that addressed. Change-Id: I98fc8cf7e4b631082c7b203b5a0a77111bec1fb9 BUG: 1328502 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/14032 Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Jeff Darcy --- rpc/xdr/src/rpc-common-xdr.x | 2 ++ 1 file changed, 2 insertions(+) (limited to 'rpc/xdr/src/rpc-common-xdr.x') diff --git a/rpc/xdr/src/rpc-common-xdr.x b/rpc/xdr/src/rpc-common-xdr.x index e94077543b7..c2b25705d20 100644 --- a/rpc/xdr/src/rpc-common-xdr.x +++ b/rpc/xdr/src/rpc-common-xdr.x @@ -1,6 +1,8 @@ /* This file has definition of few XDR structures which are * not captured in any section specific file */ +%#include "xdr-common.h" + struct auth_glusterfs_parms_v2 { int pid; unsigned int uid; -- cgit