diff options
author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:33:21 +0000 |
---|---|---|
committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:33:21 +0000 |
commit | 082df0292daa8a08012c2532ec74d8d3dd50b890 (patch) | |
tree | 22e6abcf9d6dedccbb8f2012da5cff596996254d | |
parent | d6b3eddcd9005ac023e365296cdd5ba31fc4aa0a (diff) |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN
-rw-r--r-- | src/EditresCom.c | 1 | ||||
-rw-r--r-- | src/WidgetNode.c | 3 |
2 files changed, 1 insertions, 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); |