summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2005-09-05 17:02:56 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2005-09-05 17:02:56 +0000
commit69a1b10dd38c06f34747e7a55d62fdfcec2883cc (patch)
treee10fd932e747549b9c88d3af4fa0dd81a8eb17e1 /src/input
parentb8578b7dfbada9cb57940bfec5b844ea0e871970 (diff)
downloadxine-lib-69a1b10dd38c06f34747e7a55d62fdfcec2883cc.tar.gz
xine-lib-69a1b10dd38c06f34747e7a55d62fdfcec2883cc.tar.bz2
*BUGFIX*
Build improvements and WIN32 port updates: - add --with-pthread-pefix and --with-zlib-pefix options - prepare for removing internal zlib and pthreads-win32 relics, updated documentation for possible WIN32 developers (only for me? :->) - fixed bug in unimportant part of configure.ac for MinGW due to xine paths - fixed my bug in cdda (but it compiled fine anyway) - fixed unimportant bug in planar Makefile.am - next MSVC update due to external zlib, pthreads and latest changes, removed relic includes - checked distcheck CVS patchset: 7719 CVS date: 2005/09/05 17:02:56
Diffstat (limited to 'src/input')
-rw-r--r--src/input/Makefile.am2
-rw-r--r--src/input/input_cdda.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index ff4595f4d..64b7b4920 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -76,7 +76,7 @@ xineplug_inp_file_la_LIBADD = $(XINE_LIB)
xineplug_inp_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_dvd_la_SOURCES = input_dvd.c media_helper.c
-xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav)
+xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav) $(THREAD_LIBS)
xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 0e0831c91..7ff668c47 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
* Compact Disc Digital Audio (CDDA) Input Plugin
* by Mike Melanson (melanson@pcisys.net)
*
- * $Id: input_cdda.c,v 1.76 2005/09/02 22:39:43 tmattern Exp $
+ * $Id: input_cdda.c,v 1.77 2005/09/05 17:02:57 valtri Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -32,7 +32,7 @@
#include <unistd.h>
#include <sys/types.h>
-#ifndef SYS_PARAM_H
+#ifdef SYS_PARAM_H
#include <sys/param.h>
#endif
#ifdef HAVE_DIRENT_H