summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-10-09 06:58:33 +0000
committerbapt <bapt@FreeBSD.org>2014-10-09 06:58:33 +0000
commit02099c70341e4c08bde59847e96272a9dd01b7d6 (patch)
tree19b3d68c835c674cc8e4ff3503cd1c502a2e8cb7
parent95a86b5ccc3c102cf06109fa64a760749c8279c2 (diff)
downloadFreeBSD-src-02099c70341e4c08bde59847e96272a9dd01b7d6.zip
FreeBSD-src-02099c70341e4c08bde59847e96272a9dd01b7d6.tar.gz
Fix build with rpcgen using a recent (tested with gcc 4.9.1) GNU cpp
-rw-r--r--include/rpcsvc/nis.x11
1 files changed, 3 insertions, 8 deletions
diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x
index 7a12c85..ee822d0 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
%}
OpenPOWER on IntegriCloud