--- rxvt-unicode/src/rxvtutil.C	2007/10/31 09:55:24	1.9
+++ rxvt-unicode/src/rxvtutil.C	2009/09/04 15:40:13	1.10
@@ -46,7 +46,7 @@
 }
 
 #if !HAVE_GCC_BUILTINS
-int ctz (unsigned int x) CONST
+int rxvt_ctz (unsigned int x) CONST
 {
   int r = 0;
 
@@ -61,7 +61,7 @@
   return r;
 }
 
-int popcount (unsigned int x) CONST
+int rxvt_popcount (unsigned int x) CONST
 {
   x -=  (x >> 1) & 0x55555555;
   x  = ((x >> 2) & 0x33333333) + (x & 0x33333333);