diff common.h @ 603:880c6441f56a libavutil

Change semantic of CONFIG_*, HAVE_* and ARCH_*. They are now always defined to either 0 or 1.
author aurel
date Tue, 13 Jan 2009 23:44:16 +0000
parents 0a8fe912f5a0
children 3c748945c2ad
line wrap: on
line diff
--- a/common.h	Tue Jan 13 00:14:43 2009 +0000
+++ b/common.h	Tue Jan 13 23:44:16 2009 +0000
@@ -154,7 +154,7 @@
 /* median of 3 */
 static inline av_const int mid_pred(int a, int b, int c)
 {
-#ifdef HAVE_CMOV
+#if HAVE_CMOV
     int i=b;
     __asm__ volatile(
         "cmp    %2, %1 \n\t"
@@ -323,9 +323,9 @@
         }\
     }
 
-#if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_BFIN)
+#if ARCH_X86 || ARCH_PPC || ARCH_BFIN
 #define AV_READ_TIME read_time
-#if defined(ARCH_X86)
+#if ARCH_X86
 static inline uint64_t read_time(void)
 {
     uint32_t a, d;
@@ -366,7 +366,7 @@
      return (((uint64_t)tbu)<<32) | (uint64_t)tbl;
 }
 #endif
-#elif defined(HAVE_GETHRTIME)
+#elif HAVE_GETHRTIME
 #define AV_READ_TIME gethrtime
 #endif
 
@@ -397,11 +397,11 @@
 #endif
 
 /**
- * Returns NULL if CONFIG_SMALL is defined otherwise the argument
+ * Returns NULL if CONFIG_SMALL is true otherwise the argument
  * without modifications, used to disable the definition of strings
  * (for example AVCodec long_names).
  */
-#ifdef CONFIG_SMALL
+#if CONFIG_SMALL
 #   define NULL_IF_CONFIG_SMALL(x) NULL
 #else
 #   define NULL_IF_CONFIG_SMALL(x) x