#include guards and __attribute__ fixups

7 files changed, 13 insertions, 8 deletions

diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index c14536040..c4132b767 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -33,6 +33,9 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 
 #define LOG_MODULE "demux_flac"
 #define LOG_VERBOSE
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 8f1e4f539..774c74e2c 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -42,6 +42,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 
 #define LOG_MODULE "demux_real"
 #define LOG_VERBOSE
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
index 24a983157..7853c8182 100644
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -58,7 +58,7 @@ typedef struct {
       uint32_t samplerate;
       uint32_t data_length;
       uint32_t crc32;
-    } __attribute__((__packed__)) tta;
+    } XINE_PACKED tta;
     uint8_t buffer[22]; /* This is the size of the header */
   } header;
 } demux_tta_t;
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c
index eff1977fc..1e0d3016b 100644
--- a/src/input/libdvdnav/dvd_reader.c
+++ b/src/input/libdvdnav/dvd_reader.c
@@ -30,7 +30,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
+#ifdef HAVE_DIRENT_H
 #include <dirent.h>
+#endif
 
 #ifndef HAVE_GETTIMEOFDAY
 #  ifdef WIN32
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c
index a9b015209..1dcd47eb7 100644
--- a/src/xine-engine/alphablend.c
+++ b/src/xine-engine/alphablend.c
@@ -1108,7 +1108,7 @@ static void blend_yuv_exact(uint8_t *dst_cr, uint8_t *dst_cb, int src_width,
 
 static uint8_t *(*blend_yuv_grow_extra_data(alphablend_t *extra_data, int osd_width))[ 3 ][ 2 ]
 {
-  struct __attribute__((packed)) header_s {
+  struct XINE_PACKED header_s {
     int id;
     int max_width;
     uint8_t *data[ 3 ][ 2 ];
@@ -1550,7 +1550,7 @@ static void blend_yuy2_exact(uint8_t *dst_cr, uint8_t *dst_cb, int src_width,
 
 static uint8_t *(*blend_yuy2_grow_extra_data(alphablend_t *extra_data, int osd_width))[ 3 ]
 {
-  struct __attribute__((packed)) header_s {
+  struct XINE_PACKED header_s {
     int id;
     int max_width;
     uint8_t *data[ 3 ];
diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c
index 696e99ffb..980af2f71 100644
--- a/src/xine-engine/scratch.c
+++ b/src/xine-engine/scratch.c
@@ -37,7 +37,7 @@
 #include "xineutils.h"
 #include "scratch.h"
 
-static void __attribute__((__format__(__printf__, 2, 0)))
+static void XINE_FORMAT_PRINTF(2, 0)
   scratch_printf (scratch_buffer_t *this, const char *format, va_list argp)
 {
   time_t t;
diff --git a/src/xine-engine/scratch.h b/src/xine-engine/scratch.h
index 1029276e3..c45af198f 100644
--- a/src/xine-engine/scratch.h
+++ b/src/xine-engine/scratch.h
@@ -32,10 +32,7 @@ typedef struct scratch_buffer_s scratch_buffer_t;
 
 struct scratch_buffer_s {
 
-  void
-#if __GNUC__ >= 3
-               __attribute__((__format__(__printf__, 2, 0)))
-#endif
+  void         XINE_FORMAT_PRINTF(2, 0)
                (*scratch_printf) (scratch_buffer_t *this, const char *format, va_list ap);
 
   char       **(*get_content) (scratch_buffer_t *this);