diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-05-04 20:50:55 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-05-04 20:50:55 +0000 |
| commit | 855fca8b75c5734fba4b9065750fbd52848c41ae (patch) | |
| tree | e7c14863f81fb2d0f56ddc1b05dfbbfc47db16e1 /src | |
| parent | 16a83f1287a9e3e7325c964846636b713677fd41 (diff) | |
| download | xine-lib-855fca8b75c5734fba4b9065750fbd52848c41ae.tar.gz xine-lib-855fca8b75c5734fba4b9065750fbd52848c41ae.tar.bz2 | |
Make the_font (gfontrle.c) static again, and this time fix up the other
files so that compilation still works. gfontrle.h is no longer needed.
CVS patchset: 7987
CVS date: 2006/05/04 20:50:55
Diffstat (limited to 'src')
| -rw-r--r-- | src/post/goom/Makefile.am | 2 | ||||
| -rwxr-xr-x | src/post/goom/gfontlib.c | 2 | ||||
| -rwxr-xr-x | src/post/goom/gfontrle.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am index ce70019d9..cfdd0a61e 100644 --- a/src/post/goom/Makefile.am +++ b/src/post/goom/Makefile.am @@ -30,7 +30,7 @@ xineplug_post_goom_la_SOURCES = $(extra_files) xine_goom.c \ xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(THREAD_LIBS) xineplug_post_goom_la_LDFLAGS = -avoid-version -module $(XINE_PLUGIN_MIN_SYMS) -noinst_HEADERS = cpu_info.h default_scripts.h drawmethods.h gfontlib.h gfontrle.h goom.h \ +noinst_HEADERS = cpu_info.h default_scripts.h drawmethods.h gfontlib.h goom.h \ goom_config.h goom_config_param.h goom_filters.h goom_fx.h goom_graphic.h \ goom_plugin_info.h goom_tools.h goom_typedefs.h goom_visual_fx.h goomsl.h goomsl_hash.h \ goomsl_heap.h goomsl_private.h goomsl_yacc.h ifs.h lines.h mathtools.h mmx.h \ diff --git a/src/post/goom/gfontlib.c b/src/post/goom/gfontlib.c index 710c23520..f9d6801dd 100755 --- a/src/post/goom/gfontlib.c +++ b/src/post/goom/gfontlib.c @@ -1,5 +1,5 @@ #include "goom_config.h" -#include "gfontrle.h" +#include "gfontrle.c" #include "gfontlib.h" #include <string.h> #include <stdlib.h> diff --git a/src/post/goom/gfontrle.c b/src/post/goom/gfontrle.c index 8a4b32cd0..a22545a1e 100755 --- a/src/post/goom/gfontrle.c +++ b/src/post/goom/gfontrle.c @@ -1,6 +1,6 @@ /* RGBA C-Source image dump (with zRLE compression) */ -const struct { +static const struct { unsigned int width; unsigned int height; unsigned int bytes_per_pixel; |