[MOVED FROM BAD 42/56] gst/dccp/: Fix compilation on Solaris by including filio.h...

Original commit message from CVS:
* gst/dccp/gstdccp.c:
* gst/dccp/gstdccpclientsrc.c:
Fix compilation on Solaris by including filio.h as needed.
* gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc:
* gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll2.inc:
Fix compilation with Forte - apparently it hates concatenating a
macro argument that starts with an underscore??

diff --git a/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc b/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc
index 835098a..d38cf01 100644 (file)
--- a/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc
+++ b/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc
@@ -186,52 +186,52 @@ void FUNCT_NAME(GstDeinterlaceMethod *d_method, GstDeinterlace2* object)
     {
       if (SearchEffort == 0)
        {
-         SEFUNC(0_SB);
+         SEFUNC(0SB);
        }
       else if (SearchEffort <= 1)
        {
-         SEFUNC(1_SB);
+         SEFUNC(1SB);
        }
       /*       else if (SearchEffort <= 2)
                {
-               SEFUNC(2_SB);
+               SEFUNC(2SB);
                }
       */
       else if (SearchEffort <= 3)
        {
-         SEFUNC(3_SB);
+         SEFUNC(3SB);
        }
       else if (SearchEffort <= 5)
        {
-         SEFUNC(5_SB);
+         SEFUNC(5SB);
        }
       else if (SearchEffort <= 9)
        {
-         SEFUNC(9_SB);
+         SEFUNC(9SB);
        }
       else if (SearchEffort <= 11)
        {
-         SEFUNC(11_SB);
+         SEFUNC(11SB);
        }
       else if (SearchEffort <= 13)
        {
-         SEFUNC(13_SB);
+         SEFUNC(13SB);
        }
       else if (SearchEffort <= 15)
        {
-         SEFUNC(15_SB);
+         SEFUNC(15SB);
        }
       else if (SearchEffort <= 19)
        {
-         SEFUNC(19_SB);
+         SEFUNC(19SB);
        }
       else if (SearchEffort <= 21)
        {
-         SEFUNC(21_SB);
+         SEFUNC(21SB);
        }
       else 
        {
-         SEFUNC(Max_SB);
+         SEFUNC(MaxSB);
        }
     }
 

diff --git a/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll2.inc b/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll2.inc
index 6a68f08..f6344ea 100644 (file)
--- a/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll2.inc
+++ b/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll2.inc
@@ -5,7 +5,7 @@
 #endif
 
 #ifdef USE_STRANGE_BOB
-#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##SB)
 #else
 #define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
 #endif
@@ -241,4 +241,3 @@ static inline int SEARCH_EFFORT_FUNC(Max)
 
 #undef SEARCH_EFFORT_FUNC
 
-