Merge changes from main repository.

2 files changed, 3 insertions, 13 deletions

diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 98903aac8..16eece779 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -2,14 +2,12 @@ include $(top_srcdir)/misc/Makefile.common
 
 SUBDIRS = libcdio libvcd
 
-libdir = $(XINE_PLUGINDIR)
-
 vcd_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
 
 EXTRA_DIST = $(vcd_SRCS)
 
 if ENABLE_VCD
-lib_LTLIBRARIES = xineplug_inp_vcd.la
+xineplug_LTLIBRARIES = xineplug_inp_vcd.la
 
 AM_CFLAGS = $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
 
diff --git a/src/input/vcd/xine-extra.h b/src/input/vcd/xine-extra.h
index d0b2a0bb5..cde9a26f6 100644
--- a/src/input/vcd/xine-extra.h
+++ b/src/input/vcd/xine-extra.h
@@ -80,11 +80,7 @@ bool xine_log_init(xine_t *this);
   an error, such as logging wasn't initialized. On error, nothing is 
   logged.
 */
-bool xine_log_msg(const char *format, ...)
-#ifdef __GNUC__
-__attribute__((format (printf, 1, 2)))
-#endif
-;
+bool xine_log_msg(const char *format, ...) XINE_FORMAT_PRINTF(1, 2);
 
 /*! This routine is like xine_log without any xine-specific paramenters.
   Before calling this routine you should have set up a xine log buffer via
@@ -96,11 +92,7 @@ __attribute__((format (printf, 1, 2)))
   an error, such as logging wasn't initialized. On error, nothing is 
   logged.
 */
-bool xine_log_err(const char *format, ...)
-#ifdef __GNUC__
-__attribute__((format (printf, 1, 2)))
-#endif
-;
+bool xine_log_err(const char *format, ...) XINE_FORMAT_PRINTF(1, 2);
 
 /* Free all (num_mrls) MRLS. */
 void xine_free_mrls(int *num_mrls, xine_mrl_t **mrls);