Merge changes from main repository.

2 files changed, 3 insertions, 14 deletions

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index d21c8e4db..7dd9ae21a 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -988,10 +988,7 @@ static int parse_url (char *urlbuf, char** host, int *port) {
 }
 #endif
 
-static int
-#ifdef __GNUC__
-__attribute__((format (printf, 4, 5)))
-#endif
+static int XINE_FORMAT_PRINTF(4, 5)
 network_command( xine_stream_t *stream, int socket, char *data_buf, char *msg, ...)
 {
   char     buf[_BUFSIZ];
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);