--- deliantra/server/include/compiler.h	2010/01/05 09:01:22	1.3
+++ deliantra/server/include/compiler.h	2010/05/02 11:32:14	1.7
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -43,11 +43,13 @@
 # define noinline
 #endif
 
-#if GCC_VERSION(3, 0)
+#if GCC_VERSION(4,5)
+# define decltype(x) __decltype(x)
+#elif GCC_VERSION(3,0)
 # define decltype(x) typeof(x)
 #endif
 
-#if GCC_VERSION(4,5)
+#if GCC_VERSION(4,5) && 0 // the #else part is generating better code on 4.5
 # define unreachable() __builtin_unreachable ()
 #else
  // this seems to work fine, but gcc always emits a warning for it :/