diff options
Diffstat (limited to 'src/gui_x11.c')
| -rw-r--r-- | src/gui_x11.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gui_x11.c b/src/gui_x11.c index 38f85d875e..14a0b8085f 100644 --- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -95,8 +95,8 @@ static Atom wm_atoms[2]; // Window Manager Atoms * normal font (current_fontset == NULL, use gui.text_gc and gui.back_gc). */ static XFontSet current_fontset = NULL; - -#define XDrawString(dpy, win, gc, x, y, str, n) \ +# if !defined(XDrawString) +# define XDrawString(dpy, win, gc, x, y, str, n) \ do \ { \ if (current_fontset != NULL) \ @@ -104,8 +104,9 @@ static XFontSet current_fontset = NULL; else \ XDrawString(dpy, win, gc, x, y, str, n); \ } while (0) - -#define XDrawString16(dpy, win, gc, x, y, str, n) \ +# endif +# if !defined(XDrawString16) +# define XDrawString16(dpy, win, gc, x, y, str, n) \ do \ { \ if (current_fontset != NULL) \ @@ -113,8 +114,9 @@ static XFontSet current_fontset = NULL; else \ XDrawString16(dpy, win, gc, x, y, (XChar2b *)str, n); \ } while (0) - -#define XDrawImageString16(dpy, win, gc, x, y, str, n) \ +# endif +# if !defined(XDrawImageString16) +# define XDrawImageString16(dpy, win, gc, x, y, str, n) \ do \ { \ if (current_fontset != NULL) \ @@ -122,7 +124,7 @@ static XFontSet current_fontset = NULL; else \ XDrawImageString16(dpy, win, gc, x, y, (XChar2b *)str, n); \ } while (0) - +# endif static int check_fontset_sanity(XFontSet fs); static int fontset_width(XFontSet fs); static int fontset_ascent(XFontSet fs); |