From 082df0292daa8a08012c2532ec74d8d3dd50b890 Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 15 Sep 2004 16:33:21 +0000
Subject: Pull XORG-6_8_0 to CYGWIN branch

---
 src/EditresCom.c | 1 -
 src/WidgetNode.c | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/EditresCom.c b/src/EditresCom.c
index d706112..06efe0c 100644
--- a/src/EditresCom.c
+++ b/src/EditresCom.c
@@ -40,7 +40,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xatom.h>
 #include <X11/Xos.h>		/* for strcpy declaration */
 #include <X11/Xfuncs.h>
-#include <X11/Xaw/Cardinals.h>
 #include <X11/Xmu/EditresP.h>
 #include <X11/Xmd.h>
 #include <X11/Xmu/CharSet.h>
diff --git a/src/WidgetNode.c b/src/WidgetNode.c
index f8200b1..f80c765 100644
--- a/src/WidgetNode.c
+++ b/src/WidgetNode.c
@@ -38,7 +38,6 @@ in this Software without prior written authorization from The Open Group.
 #include <stdlib.h>
 #include <X11/Xos.h>
 #include <X11/IntrinsicP.h>
-#include <X11/Xaw/Cardinals.h>
 #include <X11/Xmu/CharSet.h>
 #include <X11/Xmu/WidgetNode.h>
 
@@ -218,7 +217,7 @@ XmuWnFetchResources(XmuWidgetNode *node, Widget toplevel,
     if (node->have_resources) return;
 
     dummy = XtCreateWidget (node->label, XmuWnClass(node), toplevel,
-			    NULL, ZERO);
+			    NULL, 0);
     if (dummy) XtDestroyWidget (dummy);
 
 
-- 
cgit v1.2.1