From 2e03286b9ac5a27c32458a034f51deb3831dac77 Mon Sep 17 00:00:00 2001
From: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Thu, 20 Sep 2007 13:24:53 +0000
Subject: Make likely/unlikely accessible also in hw/. Revert the
 logfile->stderr change.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3194 c046a42c-6fe2-441c-8c8c-71466251a162
---
 exec-all.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'exec-all.h')

diff --git a/exec-all.h b/exec-all.h
index 39cb536..ca59597 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -28,12 +28,14 @@
 #define tostring(s)	#s
 #endif
 
+#ifndef likely
 #if __GNUC__ < 3
 #define __builtin_expect(x, n) (x)
 #endif
 
 #define likely(x)   __builtin_expect(!!(x), 1)
 #define unlikely(x)   __builtin_expect(!!(x), 0)
+#endif
 
 #ifdef __i386__
 #define REGPARM(n) __attribute((regparm(n)))
-- 
cgit v1.1