From 587bd2b4b7b7076dd469cabf9b8ccf77fca87cfc Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Thu, 29 May 2014 14:42:24 +0200 Subject: NetBSD build fixes for release-3.5 1) Make sure __THROW is definedThis is a backport of I6e7cb1eb59b84988e155e9a8b696e842b7ff8f7f 2) include before so that XDR is defined This was fixed in master within I20193d3f8904388e47344e523b3787dbeab044acbut weonly pull up 3) NetBSD's gettext is in libintl, hence search it at configure time This is a backport of I651a74fe49c3f087fe135dab3453fd5b18b4268a 4) include to have WEXITSTATUS defined This problem does not exist in master as WEXITSTATUS is not used 5) Do not define popcountl() on NetBSD as it is in This is a backport of I4428a88b1e0d7c5f6740022861ffe230dbbd84bd BUG: 764655 Change-Id: Ieea5a2a627e2b7930525d6c525f1602073574a97 Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/7925 Reviewed-by: Kaleb KEITHLEY Reviewed-by: Niels de Vos Tested-by: Gluster Build System --- contrib/qemu/util/hbitmap.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'contrib') diff --git a/contrib/qemu/util/hbitmap.c b/contrib/qemu/util/hbitmap.c index d93683128bd..f2f1c1934a3 100644 --- a/contrib/qemu/util/hbitmap.c +++ b/contrib/qemu/util/hbitmap.c @@ -92,10 +92,12 @@ struct HBitmap { unsigned long *levels[HBITMAP_LEVELS]; }; +#ifndef __NetBSD__ static inline int popcountl(unsigned long l) { return BITS_PER_LONG == 32 ? ctpop32(l) : ctpop64(l); } +#endif /* __NetBSD__ */ /* Advance hbi to the next nonzero word and return it. hbi->pos * is updated. Returns zero if we reach the end of the bitmap. -- cgit