--- rxvt-unicode/src/rxvtutil.h	2009/09/04 15:40:13	1.39
+++ rxvt-unicode/src/rxvtutil.h	2012/01/19 17:10:51	1.48
@@ -1,35 +1,9 @@
 #ifndef RXVT_UTIL_H
 #define RXVT_UTIL_H
 
-#include <cstdlib>
-#include <cstring>
-
-using namespace std;
-
-#define PP_CONCAT_(a, b) a ## b
-#define PP_CONCAT(a, b) PP_CONCAT_(a, b)
-#define PP_STRINGIFY_(a) #a
-#define PP_STRINGIFY(a) PP_STRINGIFY_(a)
-
-#define HAVE_GCC_BUILTINS (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ == 4))
-
-#if __GNUC__ >= 4
-# define rxvt_attribute(x) __attribute__(x)
-# define expect(expr,value)         __builtin_expect ((expr),(value))
-#else
-# define rxvt_attribute(x)
-# define expect(expr,value)         (expr)
-#endif
-
-// put into ifs if you are very sure that the expression
-// is mostly true or mosty 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)
-
-#define NORETURN rxvt_attribute ((noreturn))
-#define UNUSED   rxvt_attribute ((unused))
-#define CONST    rxvt_attribute ((const))
+#include <stdlib.h>
+#include <string.h>
+#include "ecb.h"
 
 // increases code size unless -fno-enforce-eh-specs
 #if __GNUC__
@@ -40,17 +14,6 @@
 # define THROW(x) throw x
 #endif
 
-extern class byteorder {
-  static unsigned int e; // at least 32 bits
-public:
-  byteorder ();
-
-  static bool big_endian    () { return e == 0x11223344; };
-  static bool network       () { return e == 0x11223344; };
-  static bool little_endian () { return e == 0x44332211; };
-  static bool vax           () { return e == 0x44332211; };
-} byteorder;
-
 // various utility functions
 template<typename T, typename U> static inline T    min    (T  a, U b) { return a < (T)b ? a : (T)b; }
 template<typename T, typename U> static inline void min_it (T &a, U b) {    a = a < (T)b ? a : (T)b; }
@@ -91,17 +54,6 @@
   return (T *)rxvt_temp_buf (len * sizeof (T));
 }
 
-// some bit functions, xft fuck me plenty
-#if HAVE_GCC_BUILTINS
-/* 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 rxvt_ctz      (unsigned int x) CONST;
-int rxvt_popcount (unsigned int x) CONST;
-#endif
-
 // in range including end
 #define IN_RANGE_INC(val,beg,end) \
   ((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg))