From 4f9314a5eda016d5a03ad637f2c6171794cc9291 Mon Sep 17 00:00:00 2001
From: Emmanuel Dreyfus <manu@netbsd.org>
Date: Wed, 21 May 2014 05:45:39 +0200
Subject: NetBSD qemu build fixes

Fix NetBSD build for glusterfs built in qmeu sources

BUG: 764655
Change-Id: I4428a88b1e0d7c5f6740022861ffe230dbbd84bd
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/7815
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
---
 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..e063e681f52 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__ /* we have it in <strings.h> */
 static inline int popcountl(unsigned long l)
 {
     return BITS_PER_LONG == 32 ? ctpop32(l) : ctpop64(l);
 }
+#endif
 
 /* 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