Mercurial > vim
diff src/gui_x11.c @ 23408:bdda90ed5f6c v8.2.2247
patch 8.2.2247: VMS: various smaller problems
Commit: https://github.com/vim/vim/commit/467676d468cb10db78d79d5bd2139ded9f70d26f
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Dec 30 13:14:45 2020 +0100
patch 8.2.2247: VMS: various smaller problems
Problem: VMS: various smaller problems.
Solution: Fix VMS building and other problems. (Zoltan Arpadffy)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 30 Dec 2020 13:15:05 +0100 |
| parents | 6c7e4db139a3 |
| children | 982786f8454d |
line wrap: on
line diff
--- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -95,8 +95,8 @@ static Atom wm_atoms[2]; // Window Man * 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);