summaryrefslogtreecommitdiff
path: root/exec-all.h
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-09-20 13:24:53 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-09-20 13:24:53 +0000
commit2e03286b9ac5a27c32458a034f51deb3831dac77 (patch)
tree311425319f84269e5bb4e4f7b08d231743addcfc /exec-all.h
parenta50a6282d7d3b40a4c9aa64a174f2cae5dbb5472 (diff)
downloadqemu-2e03286b9ac5a27c32458a034f51deb3831dac77.tar.gz
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
Diffstat (limited to 'exec-all.h')
-rw-r--r--exec-all.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/exec-all.h b/exec-all.h
index 39cb536adc..ca59597422 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)))