summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-02 11:22:11 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-02 11:22:11 +0000
commit5fb3bfb2a99e12431ce59d0689e89f441a3ea650 (patch)
tree4a6e1fbbd348aa607683148cb58d008abbec56c5
parentd4b05b83124ca4a5d8733d7edc5643a6c53a6649 (diff)
downloadmpv-5fb3bfb2a99e12431ce59d0689e89f441a3ea650.tar.bz2
mpv-5fb3bfb2a99e12431ce59d0689e89f441a3ea650.tar.xz
Move conditional compilation of cdinfo.c to the build system.
patch by Emanuele Giaquinta, emanuele . giaquinta #at# gmail . com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19293 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--stream/Makefile5
-rw-r--r--stream/cdinfo.c4
2 files changed, 2 insertions, 7 deletions
diff --git a/stream/Makefile b/stream/Makefile
index 87b9fc4a5e..4f52c72073 100644
--- a/stream/Makefile
+++ b/stream/Makefile
@@ -13,11 +13,10 @@ SRCS += cache2.c
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
diff --git a/stream/cdinfo.c b/stream/cdinfo.c
index 8fd835439b..a5d160e6bc 100644
--- a/stream/cdinfo.c
+++ b/stream/cdinfo.c
@@ -6,8 +6,6 @@
#include "config.h"
-#if defined(HAVE_CDDA)
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -133,5 +131,3 @@ cd_info_debug(cd_info_t *cd_info) {
}
printf("================ CD INFO === end =========\n");
}
-
-#endif