--- deliantra/server/include/util.h	2009/10/12 14:00:58	1.90
+++ deliantra/server/include/util.h	2009/11/07 18:30:05	1.93
@@ -23,32 +23,12 @@
 #ifndef UTIL_H__
 #define UTIL_H__
 
+#include <compiler.h>
+
 #define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
 #define DEBUG_SALLOC  0   // add a debug wrapper around all sallocs
 #define PREFER_MALLOC 0   // use malloc and not the slice allocator
 
-#if __GNUC__ >= 3
-# define is_constant(c)             __builtin_constant_p (c)
-# define expect(expr,value)         __builtin_expect ((expr),(value))
-# define prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
-# define noinline                   __attribute__((__noinline__))
-#else
-# define is_constant(c)             0
-# define expect(expr,value)         (expr)
-# define prefetch(addr,rw,locality)
-# define noinline
-#endif
-
-#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
-# define decltype(x) typeof(x)
-#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) ? 1 : 0, 0)
-#define expect_true(expr)  expect ((expr) ? 1 : 0, 1)
-
 #include <pthread.h>
 
 #include <cstddef>
@@ -216,6 +196,20 @@
   return (int)sqrtf ((float)n);
 }
 
+// this is kind of like the ^^ operator, if it would exist, without sequence point.
+// more handy than it looks like, due to the implicit !! done on its arguments
+inline bool
+logical_xor (bool a, bool b)
+{
+  return a != b;
+}
+
+inline bool
+logical_implies (bool a, bool b)
+{
+  return a <= b;
+}
+
 // this is only twice as fast as naive sqrtf (dx*dy+dy*dy)
 #if 0
 // and has a max. error of 6 in the range -100..+100.
@@ -708,8 +702,9 @@
 
 int similar_direction (int a, int b);
 
-// like sprintf, but returns a "static" buffer
-const char *format (const char *format, ...);
+// like v?sprintf, but returns a "static" buffer
+char *vformat (const char *format, va_list ap);
+char *format (const char *format, ...) attribute ((format (printf, 1, 2)));
 
 // safety-check player input which will become object->msg
 bool msg_is_safe (const char *msg);