--- rxvt-unicode/src/rxvtutil.h	2006/01/29 22:27:04	1.22
+++ rxvt-unicode/src/rxvtutil.h	2006/06/23 14:31:38	1.27
@@ -4,6 +4,8 @@
 #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
@@ -11,7 +13,28 @@
 
 // actually, some gcc-3.x versions work, too
 #define HAVE_GCC_BUILTINS (__GNUC__ >= 4)
-#define HAVE_GCC_BUILTINS 0
+
+#ifndef __attribute__
+# if __GNUC__
+#  if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
+#   define __attribute__(x)
+#  endif
+# endif
+# define __attribute__(x)
+#endif
+
+#define NORETURN __attribute__ ((noreturn))
+#define UNUSED   __attribute__ ((unused))
+#define CONST    __attribute__ ((const))
+
+// increases code size unless -fno-enforce-eh-specs
+#if __GNUC__
+# define NOTHROW
+# define THROW(x)
+#else
+# define NOTHROW  throw()
+# define THROW(x) throw x
+#endif
 
 extern class byteorder {
   static unsigned int e; // at least 32 bits
@@ -35,22 +58,24 @@
 
 template<typename T, typename U> static inline void swap (T& a, U& b) { T t=a; a=(T)b; b=(U)t; }
 
+template<typename T> static inline T squared_diff (T a, T b) { return (a-b)*(a-b); }
+
 // linear interpolation
 template<typename T, typename U, typename P>
 static inline
 T lerp (T a, U b, P p)
 {
-  return (int(a) * int(p) + int(b) * int(100 - p)) / 100;
+  return (long(a) * long(100 - p) + long(b) * long(p) + 50) / 100;
 }
 
 // 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); }
+static inline int ctz      (unsigned int x) CONST { return __builtin_ctz      (x); }
+static inline int popcount (unsigned int x) CONST { return __builtin_popcount (x); }
 #else
 // count trailing zero bits and count # of one bits
-int ctz      (unsigned int x);
-int popcount (unsigned int x);
+int ctz      (unsigned int x) CONST;
+int popcount (unsigned int x) CONST;
 #endif
 
 // in range including end
@@ -424,7 +449,7 @@
 void *rxvt_temp_buf (int len);
 
 template<typename T>
-inline T *
+static inline T *
 rxvt_temp_buf (int len)
 {
   return (T *)rxvt_temp_buf (len * sizeof (T));