aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/ErrHndlr.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-19 22:15:01 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-19 22:15:01 +0200
commit70ac75f4ab184c21d11b9840a47362610aaef481 (patch)
tree183b9ec7e6897fb2cea7296b461a35ca93dfce6e /nx-X11/lib/X11/ErrHndlr.c
parent6c303d9e4ffd162b8c7f59a4b135e592d923a656 (diff)
parent70e9d346fe34af127d2c827c3678e53d0f4312ae (diff)
downloadnx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.gz
nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.bz2
nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.zip
Merge branch 'uli42-pr/libX11_further_backports' into 3.6.x
Attributes GH PR #222: https://github.com/ArcticaProject/nx-libs/pull/222
Diffstat (limited to 'nx-X11/lib/X11/ErrHndlr.c')
-rw-r--r--nx-X11/lib/X11/ErrHndlr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/lib/X11/ErrHndlr.c b/nx-X11/lib/X11/ErrHndlr.c
index 4785ca157..167a68b1e 100644
--- a/nx-X11/lib/X11/ErrHndlr.c
+++ b/nx-X11/lib/X11/ErrHndlr.c
@@ -29,12 +29,12 @@ in this Software without prior written authorization from The Open Group.
#endif
#include "Xlibint.h"
-/*
+/*
* XErrorHandler - This procedure sets the X non-fatal error handler
* (_XErrorFunction) to be the specified routine. If NULL is passed in
* the original error handler is restored.
*/
-
+
XErrorHandler
XSetErrorHandler(XErrorHandler handler)
{
@@ -57,12 +57,12 @@ XSetErrorHandler(XErrorHandler handler)
return (XErrorHandler) oldhandler;
}
-/*
+/*
* XIOErrorHandler - This procedure sets the X fatal I/O error handler
- * (_XIOErrorFunction) to be the specified routine. If NULL is passed in
+ * (_XIOErrorFunction) to be the specified routine. If NULL is passed in
* the original error handler is restored.
*/
-
+
XIOErrorHandler
XSetIOErrorHandler(XIOErrorHandler handler)
{