patch 8.2.2247: VMS: various smaller problems
Problem: VMS: various smaller problems.
Solution: Fix VMS building and other problems. (Zoltan Arpadffy)
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 38f85d8..14a0b80 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -95,8 +95,8 @@
* 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 @@
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 @@
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 @@
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);