diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-02-22 13:26:00 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2015-02-22 13:26:00 +0000 |
| commit | 46f8f4bcb43be76d6c200bcbe1a33474e1ad70cb (patch) | |
| tree | 91ed2f442f96d9e44b9daa0ad035e260f460f9ea | |
| parent | 958d912ffcdb41e977fa4e95819bd4cee836b697 (diff) | |
Fix undefined reference XGetUtf8FontAndGlyph (STR #3191).
XGetUtf8FontAndGlyph was referenced in libfltk_gl if configured w/o xft
and defined in libfltk, but not exported (regression since 1.3.3).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10588 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Xutf8.h | 5 | ||||
| -rw-r--r-- | src/gl_draw.cxx | 2 | ||||
| -rw-r--r-- | src/xutf8/utf8Wrap.c | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/Xutf8.h b/src/Xutf8.h index 51fc28291..8fe0ba0cb 100644 --- a/src/Xutf8.h +++ b/src/Xutf8.h @@ -25,6 +25,7 @@ extern "C" { #include <X11/Xlib.h> #include <X11/Xlocale.h> #include <X11/Xutil.h> +#include <FL/Fl_Export.H> typedef struct { int nb_font; @@ -98,8 +99,8 @@ XUtf8UcsWidth( XUtf8FontStruct *font_set, unsigned int ucs); -int -XGetUtf8FontAndGlyph( +FL_EXPORT int +fl_XGetUtf8FontAndGlyph( XUtf8FontStruct *font_set, unsigned int ucs, XFontStruct **fnt, diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index d57d41a30..e936147f2 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -114,7 +114,7 @@ static void get_list(int r) { for (int i = 0; i < 0x400; i++) { XFontStruct *font = NULL; unsigned short id; - XGetUtf8FontAndGlyph(gl_fontsize->font, ii, &font, &id); + fl_XGetUtf8FontAndGlyph(gl_fontsize->font, ii, &font, &id); if (font) glXUseXFont(font->fid, id, 1, gl_fontsize->listbase+ii); ii++; } diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c index c39b196ec..a88e0ea97 100644 --- a/src/xutf8/utf8Wrap.c +++ b/src/xutf8/utf8Wrap.c @@ -816,10 +816,10 @@ XUtf8TextWidth(XUtf8FontStruct *font_set, /** get the X font and glyph ID of a UCS char **/ /*****************************************************************************/ int -XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, - unsigned int ucs, - XFontStruct **fnt, - unsigned short *id) { +fl_XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, + unsigned int ucs, + XFontStruct **fnt, + unsigned short *id) { /* int x; */ int *encodings; /* encodings array */ |