From 7972ed2c7913d0332aeb956c5db1ef6305082a8d Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Tue, 14 Aug 2018 17:57:31 -0400 Subject: [PATCH] include: gcc 7's cpp has problems with the line continuations in .x files --- 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 ca1b32ff3f..8420ea87d7 100644 --- a/include/rpcsvc/nis.x +++ b/include/rpcsvc/nis.x @@ -219,10 +219,7 @@ typedef struct nis_active_endpoint nis_active_endpoint; %#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 ... */ @@ -251,10 +248,8 @@ typedef struct nis_active_endpoint nis_active_endpoint; % * 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 % % % -- 2.11.4.GIT