--- rxvt-unicode/src/rxvtutil.C	2006/02/20 22:42:01	1.7
+++ rxvt-unicode/src/rxvtutil.C	2011/02/21 07:41:03	1.13
@@ -3,7 +3,7 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,27 +26,8 @@
 
 #include "rxvtutil.h"
 
-class byteorder byteorder;
-
-unsigned int byteorder::e;
-
-byteorder::byteorder ()
-{
-  union {
-    uint32_t u;
-    uint8_t b[4];
-  } w;
-
-  w.b[0] = 0x11;
-  w.b[1] = 0x22;
-  w.b[2] = 0x33;
-  w.b[3] = 0x44;
-
-  e = w.u;
-}
-
 #if !HAVE_GCC_BUILTINS
-int ctz (unsigned int x) CONST
+int rxvt_ctz (unsigned int x) CONST
 {
   int r = 0;
 
@@ -61,7 +42,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 +75,12 @@
 rxvt_temp_buf (int len)
 {
   if (len > temp_len)
-    { 
+    {
       free (temp_buf);
       temp_buf = malloc (len);
       temp_len = len;
     }
-  
+
   return temp_buf;
 }