--- rxvt-unicode/src/rxvtutil.h	2008/11/05 14:43:54	1.38
+++ rxvt-unicode/src/rxvtutil.h	2010/07/26 09:57:53	1.40
@@ -22,7 +22,7 @@
 #endif
 
 // put into ifs if you are very sure that the expression
-// is mostly true or mosty false. note that these return
+// is mostly true or mostly false. note that these return
 // booleans, not the expression.
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)
@@ -93,12 +93,13 @@
 
 // some bit functions, xft fuck me plenty
 #if HAVE_GCC_BUILTINS
-static inline int ctz      (unsigned int x) { return __builtin_ctz      (x); }
-static inline int popcount (unsigned int x) { return __builtin_popcount (x); }
+/* netbsd stupidly defines popcount itself and puts it into string.h */
+static inline int rxvt_ctz      (unsigned int x) { return __builtin_ctz      (x); }
+static inline int rxvt_popcount (unsigned int x) { return __builtin_popcount (x); }
 #else
 // count trailing zero bits and count # of one bits
-int ctz      (unsigned int x) CONST;
-int popcount (unsigned int x) CONST;
+int rxvt_ctz      (unsigned int x) CONST;
+int rxvt_popcount (unsigned int x) CONST;
 #endif
 
 // in range including end