# HG changeset patch # User diego # Date 1234064520 0 # Node ID b644796edd945ddbce3942a78e7793c40cb8816a # Parent ca5372ccff96df28338f6f62dc6d923f29cc61e2 Conditionally compile aclib.c instead of placing #ifdef around its content. diff -r ca5372ccff96 -r b644796edd94 Makefile --- a/Makefile Sun Feb 08 03:39:07 2009 +0000 +++ b/Makefile Sun Feb 08 03:42:00 2009 +0000 @@ -211,7 +211,6 @@ libmpdemux/video.c \ libmpdemux/yuv4mpeg.c \ libmpdemux/yuv4mpeg_ratio.c \ - libvo/aclib.c \ libvo/osd.c \ libvo/sub.c \ osdep/$(GETCH) \ @@ -297,6 +296,7 @@ libfaad2/syntax.c \ libfaad2/tns.c \ +SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c SRCS_COMMON-$(FTP) += stream/stream_ftp.c SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c diff -r ca5372ccff96 -r b644796edd94 configure --- a/configure Sun Feb 08 03:39:07 2009 +0000 +++ b/configure Sun Feb 08 03:42:00 2009 +0000 @@ -8026,6 +8026,7 @@ FAAC=$_faac FAAD = $_faad FAAD_INTERNAL = $_faad_internal +FASTMEMCPY = $_fastmemcpy FBDEV = $_fbdev FREETYPE = $_freetype FTP = $_ftp diff -r ca5372ccff96 -r b644796edd94 libvo/aclib.c --- a/libvo/aclib.c Sun Feb 08 03:39:07 2009 +0000 +++ b/libvo/aclib.c Sun Feb 08 03:42:00 2009 +0000 @@ -22,8 +22,6 @@ */ #include "config.h" -#ifdef CONFIG_FASTMEMCPY - #include #include #include "cpudetect.h" @@ -227,5 +225,3 @@ #endif //!RUNTIME_CPUDETECT return to; } - -#endif /* CONFIG_FASTMEMCPY */