b033a6bbb5
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.
22 lines
576 B
Text
22 lines
576 B
Text
$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"
|