From a72e695a1e3721fb9b7fcbe7c6bcb036cf4c2567 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 22 Nov 2005 22:35:57 +0000 Subject: [PATCH] Fix for #321430: unresolved symbols due to incorrect linkage on inline functions in goom. Original commit message from CVS: Fix for #321430: unresolved symbols due to incorrect linkage on inline functions in goom. Does not, however, fix the general crackheadedness of goom (global variables, oh my!); this should be moved to -bad. --- ChangeLog | 7 +++++++ gst/goom/filters.c | 4 ++-- gst/goom/graphic.h | 3 --- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cb6cf7..ab87fdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-11-22 Michael Smith + + * gst/goom/filters.c: + * gst/goom/graphic.h: + Fix compilation by making some functions static inline instead of + extern inline, matching the way they're used. + 2005-11-22 Jan Schmidt * ext/cairo/gsttextoverlay.c: (gst_text_overlay_init), diff --git a/gst/goom/filters.c b/gst/goom/filters.c index 076fedd..16f8f53 100644 --- a/gst/goom/filters.c +++ b/gst/goom/filters.c @@ -182,7 +182,7 @@ calculatePXandPY (int x, int y, int *px, int *py) /*#define _DEBUG */ -extern inline void +static inline void setPixelRGB (Uint * buffer, Uint x, Uint y, Color c) { /* buffer[ y*WIDTH + x ] = (c.r<<16)|(c.v<<8)|c.b */ @@ -220,7 +220,7 @@ setPixelRGB_ (Uint * buffer, Uint x, Color c) -extern inline void +static inline void getPixelRGB (Uint * buffer, Uint x, Uint y, Color * c) { register unsigned char *tmp8; diff --git a/gst/goom/graphic.h b/gst/goom/graphic.h index 6750390..4154d7f 100644 --- a/gst/goom/graphic.h +++ b/gst/goom/graphic.h @@ -20,7 +20,4 @@ extern const Color YELLOW; extern const Color ORANGE; extern const Color VIOLET; -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*/ -- 2.7.4