From 7cec355b9bc6a9cc2e5da0d9dd43dfe36b5b3cfb Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 9 Oct 2014 06:58:33 +0000 Subject: [PATCH] Fix build with rpcgen using a recent (tested with gcc 4.9.1) GNU cpp --- include/rpcsvc/nis.x | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x index 7a12c85c35d9..ee822d039b86 100644 --- a/include/rpcsvc/nis.x +++ b/include/rpcsvc/nis.x @@ -400,10 +400,7 @@ program NIS_PROG { %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights) %#define WORLD_DEFAULT (NIS_READ_ACC) %#define GROUP_DEFAULT (NIS_READ_ACC << 8) -%#define OWNER_DEFAULT ((NIS_READ_ACC +\ - NIS_MODIFY_ACC +\ - NIS_CREATE_ACC +\ - NIS_DESTROY_ACC) << 16) +%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16) %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT) % %/* Result manipulation defines ... */ @@ -432,10 +429,8 @@ program NIS_PROG { % * these definitions they take an nis_object *, and an int and return % * a u_char * for Value, and an int for length. % */ -%#define ENTRY_VAL(obj, col) \ - (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val -%#define ENTRY_LEN(obj, col) \ - (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len +%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val +%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len % %#ifdef __cplusplus %}