fix compile error with latest gst headers

A conflict between XDM and gst headers results in:

  cc1: warnings being treated as errors
  In file included from gstducati.h:32,
                   from gstducatividdec.h:25,
                   from gstducativp7dec.h:25,
                   from gstducativp7dec.c:40:
  /usr/include/dce/xdc/std.h:172: error: "restrict" redefined
  /usr/include/gstreamer-0.10/gst/gstmacros.h:44: note: this is the location of the previous definition

The solution is to ensure XDM headers are included first.

diff --git a/src/gstducati.c b/src/gstducati.c
index 75cef71cca86a6807c19d403f67519c368d87d3a..19ce3cd236f11d852bbeecb550f810686ebbc9f3 100644 (file)
--- a/src/gstducati.c
+++ b/src/gstducati.c
@@ -21,8 +21,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-
 #include "gstducati.h"
 #include "gstducatih264dec.h"
 #include "gstducatimpeg4dec.h"

diff --git a/src/gstducati.h b/src/gstducati.h
index 3d5031341165b62402f8505ed56e9f5e39e2feac..157d2931733eed700f95915011883befa120b286 100644 (file)
--- a/src/gstducati.h
+++ b/src/gstducati.h
@@ -23,8 +23,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <gst/gst.h>
-
 #include <tiler.h>
 #include <tilermem.h>
 #include <memmgr.h>
@@ -33,6 +31,8 @@
 #include <ti/sdo/ce/Engine.h>
 #include <ti/sdo/ce/video3/viddec3.h>
 
+#include <gst/gst.h>
+
 G_BEGIN_DECLS
 
 GST_DEBUG_CATEGORY_EXTERN (gst_ducati_debug);

diff --git a/src/gstducatih264dec.c b/src/gstducatih264dec.c
index 89522083c414526116ee4b787b231f982da280a4..eeb1d4c7010e95a219cd247bd9cb49157552aeb8 100644 (file)
--- a/src/gstducatih264dec.c
+++ b/src/gstducatih264dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducatih264dec.h"
 
 

diff --git a/src/gstducatih264dec.h b/src/gstducatih264dec.h
index ce0e636e0eea7c9fe219b8389ca1f799c3a2dc5a..a32c65d67117c93dd6cb9746ebd93dd21e654bd7 100644 (file)
--- a/src/gstducatih264dec.h
+++ b/src/gstducatih264dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIH264DEC_H__
 #define __GST_DUCATIH264DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/h264dec/ih264vdec.h>

diff --git a/src/gstducatimpeg2dec.c b/src/gstducatimpeg2dec.c
index 3dcbe0fa6228936db43c3cc5a05c16cf3a605dd3..eada5f4d614a43f1155a713c28fa7645ea2963a6 100644 (file)
--- a/src/gstducatimpeg2dec.c
+++ b/src/gstducatimpeg2dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducatimpeg2dec.h"
 
 GST_BOILERPLATE (GstDucatiMpeg2Dec, gst_ducati_mpeg2dec, GstDucatiVidDec,

diff --git a/src/gstducatimpeg2dec.h b/src/gstducatimpeg2dec.h
index cddd3645c0e43c00a22df1520c9805d706c0a734..36b9c10bd23a102e287b3fb362756de56de127e5 100644 (file)
--- a/src/gstducatimpeg2dec.h
+++ b/src/gstducatimpeg2dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIMPEG2DEC_H__
 #define __GST_DUCATIMPEG2DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/mpeg2vdec/impeg2vdec.h>

diff --git a/src/gstducatimpeg4dec.c b/src/gstducatimpeg4dec.c
index 7c16547cdbe09a3733f58f3e489c5ff190ee1789..124731a2554112e9c077743523176f88464b4985 100644 (file)
--- a/src/gstducatimpeg4dec.c
+++ b/src/gstducatimpeg4dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducatimpeg4dec.h"
 
 

diff --git a/src/gstducatimpeg4dec.h b/src/gstducatimpeg4dec.h
index 47039cf5fc799d9d82283fdb00992d2c4c0d9212..f039c08a64420ba55a2f4af48f5facb0b523d2b2 100644 (file)
--- a/src/gstducatimpeg4dec.h
+++ b/src/gstducatimpeg4dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIMPEG4DEC_H__
 #define __GST_DUCATIMPEG4DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/mpeg4dec/impeg4vdec.h>

diff --git a/src/gstducatirvdec.c b/src/gstducatirvdec.c
index c5452b3934887ee8a2a972387d11a50005352b86..adb7b6cfd869c81acd405050394e956b79795ec6 100644 (file)
--- a/src/gstducatirvdec.c
+++ b/src/gstducatirvdec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducatirvdec.h"
 
 

diff --git a/src/gstducatirvdec.h b/src/gstducatirvdec.h
index 0fb26459bd95afae14a6047c21335cc664dbd044..a10e1a7cc0aa293cd84b875e84c8cb328348f3fb 100644 (file)
--- a/src/gstducatirvdec.h
+++ b/src/gstducatirvdec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIRVDEC_H__
 #define __GST_DUCATIRVDEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/realvdec/irealvdec.h>

diff --git a/src/gstducativc1dec.c b/src/gstducativc1dec.c
index 5d5601573ac22d4481fdeec55c5fee523ff1c5bd..d76d7cd965f0b8d264a5bf101d5a8a150e7d10f1 100644 (file)
--- a/src/gstducativc1dec.c
+++ b/src/gstducativc1dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducativc1dec.h"
 
 

diff --git a/src/gstducativc1dec.h b/src/gstducativc1dec.h
index 1031cdf7d5c295a6839e4f77e9a7dcd0b46bddda..b5729c632c33af3bcbed801926496383e442492f 100644 (file)
--- a/src/gstducativc1dec.h
+++ b/src/gstducativc1dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIVC1DEC_H__
 #define __GST_DUCATIVC1DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/vc1vdec/ivc1vdec.h>

diff --git a/src/gstducatividdec.c b/src/gstducatividdec.c
index 7719fdfef40dd54b9c10e944dbf9390dd265dcf3..4cbe6d3ad1a991fce188393ba72933397eead7be 100644 (file)
--- a/src/gstducatividdec.c
+++ b/src/gstducatividdec.c
@@ -21,9 +21,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducatividdec.h"
 
 GST_BOILERPLATE (GstDucatiVidDec, gst_ducati_viddec, GstElement,

diff --git a/src/gstducatividdec.h b/src/gstducatividdec.h
index 4075da335ff2b8bdaf7d9ace967fb13a26eefe4d..2c25338fbe7c3e294f543d1d07bfd1528fccd157 100644 (file)
--- a/src/gstducatividdec.h
+++ b/src/gstducatividdec.h
@@ -20,11 +20,10 @@
 #ifndef __GST_DUCATIVIDDEC_H__
 #define __GST_DUCATIVIDDEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducati.h"
 #include "gstducatibufferpool.h"
 
+#include <gst/video/video.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/gstducativp6dec.c b/src/gstducativp6dec.c
index ec9be8f5fa037247ecd8fd7062c9ec96b1be260f..dfc9ca83e89a4fc0a4f679b1e74a8d075c56ea8a 100644 (file)
--- a/src/gstducativp6dec.c
+++ b/src/gstducativp6dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducativp6dec.h"
 
 

diff --git a/src/gstducativp6dec.h b/src/gstducativp6dec.h
index 90c7930b3f196debef242a8da40097711e654b39..f2abcfb6a39994b9542cd5321789eac276d10337 100644 (file)
--- a/src/gstducativp6dec.h
+++ b/src/gstducativp6dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIVP6DEC_H__
 #define __GST_DUCATIVP6DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/vp6dec/ivp6vdec.h>

diff --git a/src/gstducativp7dec.c b/src/gstducativp7dec.c
index fdad19a33aa09146981db515259fa6b7b50b9b99..3215c6f2e62d2ae8938bec7a56ef1edd3b5ca0fd 100644 (file)
--- a/src/gstducativp7dec.c
+++ b/src/gstducativp7dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducativp7dec.h"
 
 

diff --git a/src/gstducativp7dec.h b/src/gstducativp7dec.h
index cae9a0a103ad152a825f276a07020b43c1db28c4..a1213ac426a722b2a832153dc078e84fa8bf2512 100644 (file)
--- a/src/gstducativp7dec.h
+++ b/src/gstducativp7dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIVP7DEC_H__
 #define __GST_DUCATIVP7DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/vp7dec/ivp7vdec.h>