Mercurial > mplayer.hg

changeset 19287:b2f48e71bb53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move conditional compilation of cdinfo.c to the build system. patch by Emanuele Giaquinta, emanuele . giaquinta #at# gmail . com
author diego
date Wed, 02 Aug 2006 11:22:11 +0000
parents ac6746d40459
children ae6a7dd2f23e
files stream/Makefile stream/cdinfo.c
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/stream/Makefile	Tue Aug 01 18:44:31 2006 +0000
+++ b/stream/Makefile	Wed Aug 02 11:22:11 2006 +0000
@@ -13,11 +13,10 @@
 endif
 
 # Miscellaneous
-SRCS += cdinfo.c \
-        cue_read.c \
+SRCS += cue_read.c \
 
 ifeq ($(CDDA),yes)
-SRCS += stream_cdda.c
+SRCS += stream_cdda.c cdinfo.c
   ifeq ($(MPLAYER_NETWORK),yes)
   SRCS += stream_cddb.c
   endif
--- a/stream/cdinfo.c	Tue Aug 01 18:44:31 2006 +0000
+++ b/stream/cdinfo.c	Wed Aug 02 11:22:11 2006 +0000
@@ -6,8 +6,6 @@
 
 #include "config.h"
 
-#if defined(HAVE_CDDA) 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -133,5 +131,3 @@
 	}
 	printf("================ CD INFO ===  end  =========\n");
 }
-
-#endif