Correct spelling of __VA_ARGS__ macro

CVS patchset: 1324
CVS date: 2002/01/02 18:16:07

25 files changed, 80 insertions, 72 deletions

diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index e4e7cca48..b6696416d 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_asf.c,v 1.17 2001/12/27 14:30:29 f1rmb Exp $
+ * $Id: demux_asf.c,v 1.18 2002/01/02 18:16:07 jkeil Exp $
  *
  * demultiplexer for asf streams
  *
@@ -69,11 +69,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index bde7f9809..536829871 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_avi.c,v 1.59 2001/12/27 14:30:29 f1rmb Exp $
+ * $Id: demux_avi.c,v 1.60 2002/01/02 18:16:07 jkeil Exp $
  *
  * demultiplexer for avi streams
  *
@@ -59,11 +59,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c
index 1f3438460..2a916f947 100644
--- a/src/demuxers/demux_cda.c
+++ b/src/demuxers/demux_cda.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_cda.c,v 1.4 2001/12/27 14:30:29 f1rmb Exp $
+ * $Id: demux_cda.c,v 1.5 2002/01/02 18:16:07 jkeil Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -47,11 +47,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index 572c2ca15..44f000590 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_elem.c,v 1.31 2001/12/27 14:30:29 f1rmb Exp $
+ * $Id: demux_elem.c,v 1.32 2002/01/02 18:16:07 jkeil Exp $
  *
  * demultiplexer for elementary mpeg streams
  * 
@@ -56,11 +56,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 4a9859621..8df1d4fe1 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg.c,v 1.47 2001/12/27 14:30:29 f1rmb Exp $
+ * $Id: demux_mpeg.c,v 1.48 2002/01/02 18:16:07 jkeil Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -56,11 +56,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 39611f8d3..717a3990a 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg_block.c,v 1.69 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: demux_mpeg_block.c,v 1.70 2002/01/02 18:16:07 jkeil Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  *
@@ -56,11 +56,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index c6199d19e..9961d5619 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpgaudio.c,v 1.31 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: demux_mpgaudio.c,v 1.32 2002/01/02 18:16:07 jkeil Exp $
  *
  * demultiplexer for mpeg audio (i.e. mp3) streams
  *
@@ -54,11 +54,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 4338c127e..b78f9cd63 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ogg.c,v 1.12 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: demux_ogg.c,v 1.13 2002/01/02 18:16:07 jkeil Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -57,11 +57,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c
index d65f10fd3..26d36ecad 100644
--- a/src/demuxers/demux_pes.c
+++ b/src/demuxers/demux_pes.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_pes.c,v 1.16 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: demux_pes.c,v 1.17 2002/01/02 18:16:07 jkeil Exp $
  *
  * demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
  * reads streams of variable blocksizes
@@ -57,11 +57,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 0dadf936b..e6e9972b9 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_qt.c,v 1.17 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: demux_qt.c,v 1.18 2002/01/02 18:16:07 jkeil Exp $
  *
  * demultiplexer for quicktime streams, based on:
  *
@@ -67,11 +67,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 9ae4f1525..57a54f3b0 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ts.c,v 1.32 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: demux_ts.c,v 1.33 2002/01/02 18:16:07 jkeil Exp $
  *
  * Demultiplexer for MPEG2 Transport Streams.
  *
@@ -82,11 +82,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_DEMUX, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_DEMUX, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/input/input_cda.c b/src/input/input_cda.c
index 1ac7de2d4..9034921bb 100644
--- a/src/input/input_cda.c
+++ b/src/input/input_cda.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_cda.c,v 1.13 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: input_cda.c,v 1.14 2002/01/02 18:16:07 jkeil Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -96,11 +96,11 @@ extern int errno;
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 2edd6992f..7f5b1cc63 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_dvd.c,v 1.41 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: input_dvd.c,v 1.42 2002/01/02 18:16:07 jkeil Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -65,11 +65,11 @@ extern int errno;
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
@@ -215,7 +215,7 @@ typedef union {
  * Read DVD "Copyright Structure" from DVD Drive
  */
 static int
-dvd_read_copyright(int fd, dvd_struct *s)
+dvd_read_copyright(dvd_input_plugin_t *this, dvd_struct *s)
 {
   struct uscsi_cmd sc;
   union scsi_cdb rs_cdb;
@@ -238,7 +238,7 @@ dvd_read_copyright(int fd, dvd_struct *s)
   
   memset(buf, 0, sizeof(buf));
 
-  if (ioctl(fd, USCSICMD, &sc)) {
+  if (ioctl(this->raw_fd, USCSICMD, &sc)) {
     LOG_MSG(this->xine, _("USCSICMD dvd_read_copyright: %s"), strerror(errno));
     return -1;
   }
@@ -333,10 +333,10 @@ static int openDVDFile (dvd_input_plugin_t *this,
 
     dvd.copyright.type      = DVD_STRUCT_COPYRIGHT;
     dvd.copyright.layer_num = 0;
-    if (dvd_read_copyright(this->raw_fd, &dvd) < 0)
+    if (dvd_read_copyright(this, &dvd) < 0) {
       LOG_MSG(this->xine, _("input_dvd: Could not read Copyright Structure.\n"
 			    "           Assuming disk is not encrypted.\n"));
-    else
+    } else 
       encrypted = (dvd.copyright.cpst != 0);
   }
 #endif
diff --git a/src/input/input_file.c b/src/input/input_file.c
index d06833df0..b794fbbbc 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_file.c,v 1.36 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: input_file.c,v 1.37 2002/01/02 18:16:07 jkeil Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -54,11 +54,11 @@ extern int errno;
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/input/input_http.c b/src/input/input_http.c
index cb5cfae38..9193bc5f6 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -53,11 +53,11 @@ extern int errno;
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 682a4b784..2bbd85242 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -58,11 +58,11 @@ extern int errno;
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 9ca25cd0e..0e8c4bb5f 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -97,11 +97,11 @@ extern int errno;
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 0db8e609e..aa5e3627d 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_stdin_fifo.c,v 1.18 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: input_stdin_fifo.c,v 1.19 2002/01/02 18:16:07 jkeil Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -53,11 +53,11 @@ extern int errno;
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index e86d8b57d..347b50f79 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_vcd.c,v 1.34 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: input_vcd.c,v 1.35 2002/01/02 18:16:07 jkeil Exp $
  *
  */
 
@@ -64,11 +64,11 @@ extern int errno;
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h
index be9678cf4..aa8f9b54a 100644
--- a/src/libffmpeg/libavcodec/common.h
+++ b/src/libffmpeg/libavcodec/common.h
@@ -142,11 +142,19 @@ inline void dprintf(const char* fmt,...) {}
 
 #else
 
+#ifdef __GNUC__
 #ifdef DEBUG
 #define dprintf(fmt,args...) printf(fmt, ## args)
 #else
 #define dprintf(fmt,args...)
 #endif
+#else
+#ifdef DEBUG
+#define dprintf(fmt,...) printf(fmt, __VA_ARGS__)
+#else
+#define dprintf(fmt,...)
+#endif
+#endif
 
 #endif /* !CONFIG_WIN32 */
 
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 49f177af4..00bc05b43 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: load_plugins.c,v 1.63 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: load_plugins.c,v 1.64 2002/01/02 18:16:07 jkeil Exp $
  *
  *
  * Load input/demux/audio_out/video_out/codec plugins
@@ -62,11 +62,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_PLUGIN, __VAR_ARGS__);                   \
+    xine_log(xine, XINE_LOG_PLUGIN, __VA_ARGS__);                    \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_PLUGIN, __VAR_ARGS__);                   \
+    xine_log(xine, XINE_LOG_PLUGIN, __VA_ARGS__);                    \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index 6f801eb09..86755fe6b 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: metronom.c,v 1.46 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: metronom.c,v 1.47 2002/01/02 18:16:08 jkeil Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -60,11 +60,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log((xine_t*)xine, XINE_LOG_METRONOM, __VAR_ARGS__);        \
+    xine_log((xine_t*)xine, XINE_LOG_METRONOM, __VA_ARGS__);         \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log((xine_t*)xine, XINE_LOG_METRONOM, __VAR_ARGS__);        \
+    xine_log((xine_t*)xine, XINE_LOG_METRONOM, __VA_ARGS__);         \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index a32ce6f88..c1e808bc9 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out.c,v 1.61 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: video_out.c,v 1.62 2002/01/02 18:16:08 jkeil Exp $
  *
  */
 
@@ -47,11 +47,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_VIDEO, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_VIDEO, __VA_ARGS__);                     \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_VIDEO, __VAR_ARGS__);                    \
+    xine_log(xine, XINE_LOG_VIDEO, __VA_ARGS__);                     \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 6ecea0236..60729e63e 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine.c,v 1.94 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: xine.c,v 1.95 2002/01/02 18:16:08 jkeil Exp $
  *
  * top-level xine functions
  *
@@ -67,11 +67,11 @@
   }
 #else
 #define LOG_MSG_STDERR(xine, ...) {                                  \
-    xine_log(xine, XINE_LOG_MSG, __VAR_ARGS__);                      \
+    xine_log(xine, XINE_LOG_MSG, __VA_ARGS__);                       \
     fprintf(stderr, __VA_ARGS__);                                    \
   }
 #define LOG_MSG(xine, ...) {                                         \
-    xine_log(xine, XINE_LOG_MSG, __VAR_ARGS__);                      \
+    xine_log(xine, XINE_LOG_MSG, __VA_ARGS__);                       \
     printf(__VA_ARGS__);                                             \
   }
 #endif
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 634cf0c74..fda43ad98 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xineutils.h,v 1.5 2001/12/05 15:12:03 guenter Exp $
+ * $Id: xineutils.h,v 1.6 2002/01/02 18:16:08 jkeil Exp $
  *
  */
 #ifndef XINEUTILS_H
@@ -549,7 +549,7 @@ void xine_probe_fast_memcpy(config_values_t *config);
 #define perr(...)	  {fprintf(stderr, __VA_ARGS__);fflush(stderr);}
 #endif
 
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || !defined(__GNUC__) 
 #define xlerror(...) do {                                                     \
         printf("XINE lib %s:%d:(%s) ", __FILE__, __LINE__, __XINE_FUNCTION__);   \
         printf(__VA_ARGS__);                                                     \