From e398f1335dbd1927acc8bdd9ceee047678521545 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 28 Jun 2014 22:10:48 +0200 Subject: [PATCH] kernel/pf: Check size of long at compile time (fixes i386 build). --- sys/net/pf/pf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/net/pf/pf.c b/sys/net/pf/pf.c index 8f6e307c7a..ce47936895 100644 --- a/sys/net/pf/pf.c +++ b/sys/net/pf/pf.c @@ -873,13 +873,13 @@ pf_state_insert(struct pfi_kif *kif, struct pf_state_key *skw, if (s->id == 0 && s->creatorid == 0) { u_int64_t sid; - if (sizeof(long) == 8) { - sid = atomic_fetchadd_long(&pf_status.stateid, 1); - } else { - spin_lock(&pf_spin); - sid = pf_status.stateid++; - spin_unlock(&pf_spin); - } +#if __SIZEOF_LONG__ == 8 + sid = atomic_fetchadd_long(&pf_status.stateid, 1); +#else + spin_lock(&pf_spin); + sid = pf_status.stateid++; + spin_unlock(&pf_spin); +#endif s->id = htobe64(sid); s->creatorid = pf_status.hostid; } -- 2.41.0