From: root <root@braid.x>
Date: Mon, 31 Mar 2008 11:07:45 +0000 (+0200)
Subject: Merge commit 'remotes/fml/master'
X-Git-Tag: v0.0.5~5
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=3de0718ad11e13e063e5a24be5758883c48c5ac2;hp=9f00c1b8d6e8a345aba4ec225d7d90a8a423d5f3

Merge commit 'remotes/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