--- deliantra/server/include/util.h	2007/05/28 21:15:56	1.46
+++ deliantra/server/include/util.h	2007/06/02 03:48:29	1.47
@@ -35,6 +35,10 @@
 # define prefetch(addr,rw,locality)
 #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.
@@ -52,7 +56,7 @@
 #include <traits.h>
 
 // use a gcc extension for auto declarations until ISO C++ sanctifies them
-#define auto(var,expr) typeof(expr) var = (expr)
+#define auto(var,expr) decltype(expr) var = (expr)
 
 // very ugly macro that basicaly declares and initialises a variable
 // that is in scope for the next statement only