Mercurial > libavcodec.hg

diff common.h @ 1982:800db77ec7c8 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid macro conflicts
author alex
date Mon, 26 Apr 2004 09:43:55 +0000
parents f74f306c30b5
children f8ef6f664234
line wrap: on
line diff
--- 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>