From 97f39d46478583613258d50acdc209e5c489a969 Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.net>
Date: Wed, 19 Oct 2005 10:57:46 +0000
Subject: 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).
---
 gst/goom/filters.c | 10 +++++-----
 gst/goom/graphic.h |  6 ++++--
 gst/goom/lines.c   |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'gst/goom')

diff --git a/gst/goom/filters.c b/gst/goom/filters.c
index 9fadf2f6..076fedd9 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 415dde73..67503900 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 e497b5eb..0ff6ae20 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;
-- 
cgit