[SCM] libav/experimental: Preprocessor #defines starting with __ are reserved for the system.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 34933442ac94036408279df7704d833d2a725a89
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Jun 7 17:19:37 2007 +0000

    Preprocessor #defines starting with __ are reserved for the system.
    
    Originally committed as revision 9251 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index dd4d179..3bc2d78 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -437,7 +437,7 @@ tests: apiexample $(TESTS)
 apiexample: apiexample.o $(LIB)
 
 cpuid_test: i386/cputest.c
-	$(CC) $(CFLAGS) -D__TEST__ -o $@ $<
+	$(CC) $(CFLAGS) -DTEST -o $@ $<
 
 imgresample-test: imgresample.c $(LIB)
 	$(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
diff --git a/libavcodec/i386/cputest.c b/libavcodec/i386/cputest.c
index b8f5055..d039ffe 100644
--- a/libavcodec/i386/cputest.c
+++ b/libavcodec/i386/cputest.c
@@ -119,7 +119,7 @@ int mm_support(void)
     return rval;
 }
 
-#ifdef __TEST__
+#ifdef TEST
 int main ( void )
 {
   int mm_flags;

-- 
Libav/FFmpeg packaging