From ab4dd923d778048d5ba4a0bab7e730d0c157b322 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 11 Dec 2016 15:27:08 +0100 Subject: Fix portability to C90 and C++. --- uid_db.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'uid_db.c') diff --git a/uid_db.c b/uid_db.c index 97b1c2ba..18f4d6b3 100644 --- a/uid_db.c +++ b/uid_db.c @@ -10,12 +10,13 @@ /* Have Solaris expose ffs() from strings.h: */ #define __EXTENSIONS__ +#define _XOPEN_SOURCE 700 /* includes */ #include #include #include -#include // ffs() lives here - needs #define on Solaris. +#include /* ffs() lives here - needs #define on Solaris. */ #include "xmalloc.h" #include "uid_db.h" @@ -94,8 +95,8 @@ static struct pat_node *walk_down(struct uid_db *db, struct uid_db_record *rec, *parentp = (struct pat_node *) ((unsigned char *)edge - (v & bit_mask(bit_ndx) ? - offsetof(struct pat_node, ptrs_[2]) - : offsetof(struct pat_node, ptrs_[0]))); + offsetof(struct pat_node, ptrs_) + 2 * sizeof(struct pat_node *) + : offsetof(struct pat_node, ptrs_))); *edgep = edge; return cur; } -- cgit v1.2.3