gst/goom/: Make inline functions either 'static inline' or 'extern inline', otherwise the Forte compiler apparently w...

Original commit message from CVS:
* gst/goom/filters.c:
* gst/goom/graphic.h:
* gst/goom/lines.c:
Make inline functions either 'static inline' or 'extern inline',
otherwise the Forte compiler apparently won't inline them (#317300).

4 files changed, 18 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f3ea9752..6acd2710c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-19  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/goom/filters.c:
+	* gst/goom/graphic.h:
+	* gst/goom/lines.c:
+	  Make inline functions either 'static inline' or 'extern inline',
+	  otherwise the Forte compiler apparently won't inline them (#317300).
+
 2005-10-19  Julien MOUTTE  <julien@moutte.net>
 
 	* ext/libpng/gstpngdec.c: (gst_pngdec_class_init),
diff --git a/gst/goom/filters.c b/gst/goom/filters.c
index 9fadf2f6b..076fedd9d 100644
--- a/gst/goom/filters.c
+++ b/gst/goom/filters.c
@@ -75,7 +75,7 @@ static int *firedec = 0;
 
 
 /* retourne x>>s , en testant le signe de x */
-inline int
+static inline int
 ShiftRight (int x, const unsigned char s)
 {
   if (x < 0)
@@ -182,7 +182,7 @@ calculatePXandPY (int x, int y, int *px, int *py)
 
 /*#define _DEBUG */
 
-inline void
+extern inline void
 setPixelRGB (Uint * buffer, Uint x, Uint y, Color c)
 {
 /*		buffer[ y*WIDTH + x ] = (c.r<<16)|(c.v<<8)|c.b */
@@ -201,7 +201,7 @@ setPixelRGB (Uint * buffer, Uint x, Uint y, Color c)
 }
 
 
-inline void
+static inline void
 setPixelRGB_ (Uint * buffer, Uint x, Color c)
 {
 #ifdef _DEBUG
@@ -220,7 +220,7 @@ setPixelRGB_ (Uint * buffer, Uint x, Color c)
 
 
 
-inline void
+extern inline void
 getPixelRGB (Uint * buffer, Uint x, Uint y, Color * c)
 {
   register unsigned char *tmp8;
@@ -250,7 +250,7 @@ getPixelRGB (Uint * buffer, Uint x, Uint y, Color * c)
 }
 
 
-inline void
+static inline void
 getPixelRGB_ (Uint * buffer, Uint x, Color * c)
 {
   register unsigned char *tmp8;
diff --git a/gst/goom/graphic.h b/gst/goom/graphic.h
index 415dde73c..67503900c 100644
--- a/gst/goom/graphic.h
+++ b/gst/goom/graphic.h
@@ -1,6 +1,8 @@
 #ifndef GRAPHIC_H
 #define GRAPHIC_H
 
+#include <glib.h>  /* defines inline for better portability */
+
 typedef unsigned int Uint;
 
 typedef struct
@@ -18,7 +20,7 @@ extern const Color YELLOW;
 extern const Color ORANGE;
 extern const Color VIOLET;
 
-inline void setPixelRGB (Uint *buffer, Uint x, Uint y, Color c) ;
-inline void getPixelRGB (Uint *buffer, Uint x, Uint y, Color *c) ;
+extern inline void setPixelRGB (Uint *buffer, Uint x, Uint y, Color c) ;
+extern inline void getPixelRGB (Uint *buffer, Uint x, Uint y, Color *c) ;
 
 #endif /*GRAPHIC_H*/
diff --git a/gst/goom/lines.c b/gst/goom/lines.c
index e497b5eb3..0ff6ae20e 100644
--- a/gst/goom/lines.c
+++ b/gst/goom/lines.c
@@ -16,7 +16,7 @@
 
 extern unsigned int resolx, resoly;
 
-inline unsigned char
+static inline unsigned char
 lighten (unsigned char value, unsigned char power)
 {
   unsigned char i;