--- valgrind/include/pub_tool_basics.h.jj	2010-10-20 22:19:27.000000000 +0200
+++ valgrind/include/pub_tool_basics.h	2010-11-05 18:03:15.416830321 +0100
@@ -316,7 +316,7 @@ static inline Bool sr_EQ ( SysRes sr1, S
 #define VG_BUGS_TO "www.valgrind.org"
 
 /* Branch prediction hints. */
-#if 1 /*HAVE_BUILTIN_EXPECT*/
+#if defined(__GNUC__) && (__GNUC__ >= 3) /*HAVE_BUILTIN_EXPECT*/
 #  define LIKELY(x)   __builtin_expect(!!(x), 1)
 #  define UNLIKELY(x) __builtin_expect((x), 0)
 #else