diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-30 13:14:45 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-30 13:14:45 +0100 |
| commit | 467676d468cb10db78d79d5bd2139ded9f70d26f (patch) | |
| tree | 6774f48d11ae06b628bbaee4f029114392172fea /src/gui_x11.c | |
| parent | 4d8c96d4668ac965d4e84b9676fba6d7efe62a32 (diff) | |
| download | vim-git-467676d468cb10db78d79d5bd2139ded9f70d26f.tar.gz | |
patch 8.2.2247: VMS: various smaller problemsv8.2.2247
Problem: VMS: various smaller problems.
Solution: Fix VMS building and other problems. (Zoltan Arpadffy)
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 38f85d875..14a0b8085 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); |