rework previous fix for mutple definitions

diff --git a/lib/common/gdgen.c b/lib/common/gdgen.c
index d3b08d71372b2037154edfcd4abe515cd5a72e1b..ce7eaffe05274246580e17b34f307793ea76156c 100644 (file)
--- a/lib/common/gdgen.c
+++ b/lib/common/gdgen.c
@@ -528,12 +528,12 @@ static gdFontPtr builtinFont(double fsize)
     }
 }
 
-static int builtinFontHt(double fontsz)
+int builtinFontHt(double fontsz)
 {
     gdFontPtr fp = builtinFont(fontsz);
     return fp->h;
 }
-static int builtinFontWd(double fontsz)
+int builtinFontWd(double fontsz)
 {
     gdFontPtr fp = builtinFont(fontsz);
     return fp->w;

diff --git a/lib/common/render.h b/lib/common/render.h
index 57c6ef09f18e0a0d6995eb35f4ea36c50d6e59a9..92a2131a8879ba8bec9dffe2ef4897a652ff5b90 100644 (file)
--- a/lib/common/render.h
+++ b/lib/common/render.h
@@ -176,6 +176,8 @@ extern "C" {
 #ifndef HAVE_GD_FREETYPE
     extern void initDPI(graph_t *);
     extern double textheight(int nlines, double fontsz);
+    extern int builtinFontHt(double fontsz);
+    extern int builtinFontWd(double fontsz);
 #endif
     extern codegen_info_t *first_codegen(void);
     extern codegen_info_t *next_codegen(codegen_info_t * p);

diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c
index 418108e29faccef72c5edc225eea69903fdf7a52..2a49be675535b733188180aaec12fc971f33c356 100644 (file)
--- a/plugin/gd/gvrender_gd.c
+++ b/plugin/gd/gvrender_gd.c
@@ -394,17 +394,6 @@ static gdFontPtr builtinFont(double fsize)
        return gdFontGiant;
     }
 }
-
-static int builtinFontHt(double fontsz)
-{
-    gdFontPtr fp = builtinFont(fontsz);
-    return fp->h;
-}
-static int builtinFontWd(double fontsz)
-{
-    gdFontPtr fp = builtinFont(fontsz);
-    return fp->w;
-}
 #endif
 
 static void gdgen_textpara(GVJ_t * job, pointf p, textpara_t * para)