From: root <root@braid.x>
Date: Mon, 14 Apr 2008 16:33:39 +0000 (+0200)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.0.5~4
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=73b1e1c9b290c8d462cc4e7aeb16381711e07a4c;hp=cb2dd233bd5f05ba723df4c39623576aa36b82d2;p=dss.git

Merge commit 'fml/master'
---

diff --git a/gcc-compat.h b/gcc-compat.h
index 61c3c88..4451980 100644
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -1,9 +1,6 @@
-# define inline		inline __attribute__ ((always_inline))
 # define __noreturn	__attribute__ ((noreturn))
 # define __malloc	__attribute__ ((malloc))
 # define __a_unused	__attribute__ ((unused))
-# define likely(x)	__builtin_expect (!!(x), 1)
-# define unlikely(x)	__builtin_expect (!!(x), 0)
 /* 
  * p is the number of the "format string" parameter, and q is 
  * the number of the first variadic parameter