3 files changed, 6 insertions, 12 deletions
diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c
index 8ab661d3e..30cdadc7c 100644
--- a/src/xine-engine/broadcaster.c
+++ b/src/xine-engine/broadcaster.c
@@ -137,10 +137,7 @@ static int sock_data_write(xine_t *xine, int socket, char *buf, int len) {
   return wlen;
 }
 
-static int
-#ifdef __GNUC__
-__attribute__((format (printf, 3, 4)))
-#endif
+static int XINE_FORMAT_PRINTF(3, 4)
 sock_string_write(xine_t *xine, int socket, char *msg, ...) {
   char     buf[_BUFSIZ];
   va_list  args;
@@ -182,10 +179,7 @@ static void broadcaster_data_write(broadcaster_t *this, char *buf, int len) {
   }
 }
 
-static void
-#ifdef __GNUC__
-__attribute__((format (printf, 2, 3)))
-#endif
+static void XINE_FORMAT_PRINTF(2, 3)
 broadcaster_string_write(broadcaster_t *this, char *msg, ...) {
   char     buf[_BUFSIZ];
   va_list  args;
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 4a71a99c2..2d455b67c 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -49,13 +49,13 @@
 typedef struct video_db_s {
    uint32_t fourcc[20];
    uint32_t buf_type;
-   const char name[];
+   const char *name;
 } video_db_t;
 
 typedef struct audio_db_s {
    uint32_t formattag[10];
    uint32_t buf_type;
-   const char name[];
+   const char *name;
 } audio_db_t;
 
 
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c
index 04a3034a3..7bd9292c8 100644
--- a/src/xine-engine/video_overlay.c
+++ b/src/xine-engine/video_overlay.c
@@ -49,10 +49,10 @@ typedef struct video_overlay_showing_s {
 
 
 typedef struct video_overlay_s {
-  xine_t                   *xine;
-
   video_overlay_manager_t   video_overlay;
   
+  xine_t                   *xine;
+
   pthread_mutex_t           events_mutex;  
   video_overlay_events_t    events[MAX_EVENTS];
   pthread_mutex_t           objects_mutex;