summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:10 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:10 +0000
commit3f2cefe76cd5eb65b56e86331bd2533296a5a339 (patch)
tree9096e93070fedb285367ea2d24d7a904589879a7
parent4b903d250b616ed4b43a4211f1e8c8d002090618 (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
-rw-r--r--xconsole.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xconsole.c b/xconsole.c
index 6e2bc13..cf0a7bb 100644
--- a/xconsole.c
+++ b/xconsole.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/xconsole/xconsole.c,v 3.31 2002/10/16 02:27:40 dawes Exp $ */
+/* $XFree86: xc/programs/xconsole/xconsole.c,v 3.32 2003/05/27 22:26:59 tsi Exp $ */
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
@@ -341,7 +341,7 @@ IOError(Display *dpy)
{
if (child_pid > 0)
kill(child_pid, SIGTERM);
- (*ioerror)(dpy);
+ return (*ioerror)(dpy);
}
#endif