diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
| commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
| tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXmu/src/WidgetNode.c | |
| parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
| parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
| download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'libXmu/src/WidgetNode.c')
| -rw-r--r-- | libXmu/src/WidgetNode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libXmu/src/WidgetNode.c b/libXmu/src/WidgetNode.c index 8ce169eb5..0cf0bb6c9 100644 --- a/libXmu/src/WidgetNode.c +++ b/libXmu/src/WidgetNode.c @@ -1,5 +1,5 @@ /* - + Copyright 1989, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -101,7 +101,7 @@ find_resource(XmuWidgetNode *node, char *name, Bool cons) #define nreslist (int) (cons ? sup->nconstraints : sup->nresources) res.resource_name = name; - for (sup = node->superclass; + for (sup = node->superclass; sup && (XtResourceList) binsearch ((char *) &res, reslist, nreslist, sizeof(XtResource), @@ -195,7 +195,7 @@ XmuWnInitializeNodes(XmuWidgetNode *nodearray, int nnodes) */ superclass = superclass->core_class.superclass; } - done: + done: if (wn->superclass) { wn->siblings = wn->superclass->children; wn->superclass->children = wn; |