summaryrefslogtreecommitdiff
path: root/x11/Xaw-Xpm/patches/patch-ac
blob: 3b6f41e3b93d5236d04277316469d941bb6d8437 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
$NetBSD: patch-ac,v 1.1 2000/12/06 09:02:01 jlam Exp $

--- Label.h.orig	Sat Nov  9 22:07:44 1996
+++ Label.h
@@ -98,6 +98,17 @@
 #define XawTextEncoding8bit	0
 #define XawTextEncodingChar2b	1
 
+/*
+ * These two macros are multiply defined in Label.h, List.h, and SmeBSB.h.
+ * We undefine them before setting up their definitions in each header file.
+ */
+#ifdef XtCtextBorder
+#undef XtCtextBorder
+#endif
+#ifdef XtCdrawTextBorder
+#undef XtCdrawTextBorder
+#endif
+
 #define XtNleftBitmap "leftBitmap"
 #define XtCLeftBitmap "LeftBitmap"
 #define XtNencoding "encoding"