diff -ru qemu-snapshot-2004-10-14_23/exec-all.h qemu-snapshot-2004-10-14_23-expect/exec-all.h
--- qemu-snapshot-2004-10-14_23/exec-all.h	2004-10-03 17:03:34.000000000 +0200
+++ qemu-snapshot-2004-10-14_23-expect/exec-all.h	2004-10-27 23:58:40.000000000 +0200
@@ -28,7 +28,7 @@
 #define tostring(s)	#s
 #endif
 
-#if GCC_MAJOR < 3
+#if __GNUC__ < 3
 #define __builtin_expect(x, n) (x)
 #endif