--- rxvt-unicode/src/rxvtutil.C	2006/02/20 22:40:35	1.6
+++ rxvt-unicode/src/rxvtutil.C	2009/09/04 15:40:13	1.10
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:	rxvtutil.C
  *----------------------------------------------------------------------*
  *
@@ -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);
@@ -94,12 +94,11 @@
 rxvt_temp_buf (int len)
 {
   if (len > temp_len)
-    { 
-      free (temp_buf);
-      temp_buf = malloc (len);
+    {
+      temp_buf = realloc (temp_buf, len);
       temp_len = len;
     }
-  
+
   return temp_buf;
 }