# HG changeset patch
# User alex
# Date 1082972635 0
# Node ID 800db77ec7c8e7a5bb1688081d7388ecb72185eb
# Parent  1ba490d60bb976380df2449599ab39897543531f
avoid macro conflicts

diff -r 1ba490d60bb9 -r 800db77ec7c8 common.h
--- a/common.h	Mon Apr 26 08:51:56 2004 +0000
+++ b/common.h	Mon Apr 26 09:43:55 2004 +0000
@@ -76,17 +76,21 @@
 #    define restrict
 #endif
 
+#ifndef always_inline
 #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
 #    define always_inline __attribute__((always_inline)) inline
 #else
 #    define always_inline inline
 #endif
+#endif
 
+#ifndef attribute_used
 #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
 #    define attribute_used __attribute__((used))
 #else
 #    define attribute_used
 #endif
+#endif
 
 #ifndef EMULATE_INTTYPES
 #   include <inttypes.h>