summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Woelders <kim@woelders.dk>2010-02-20 11:51:07 +0000
committerKim Woelders <kim@woelders.dk>2010-02-20 11:51:07 +0000
commitd67ea1d0966c8ca79affc56cdb469bcaecb76e82 (patch)
tree999b9fcf836976bd2d8f41e1fa2c482d1ceb51ea
parent08183bec3fbd5f4821e9f7ac06a5c619266b8e61 (diff)
downloadimlib2-d67ea1d0966c8ca79affc56cdb469bcaecb76e82.tar.gz
Avoid cast.
SVN revision: 46335
-rw-r--r--src/lib/ximage.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ximage.c b/src/lib/ximage.c
index 5d7103f..3811db6 100644
--- a/src/lib/ximage.c
+++ b/src/lib/ximage.c
@@ -24,11 +24,11 @@ static int list_max_count = 0;
static char _x_err = 0;
/* the fucntion we use for catching the error */
-static void
+static int
TmpXError(Display * d, XErrorEvent * ev)
{
_x_err = 1;
- return;
+ return 0;
d = NULL;
ev = NULL;
}
@@ -74,7 +74,7 @@ __imlib_ShmGetXImage(Display * d, Visual * v, Drawable draw, int depth,
/* setup a temporary error handler */
_x_err = 0;
XSync(d, False);
- ph = XSetErrorHandler((XErrorHandler) TmpXError);
+ ph = XSetErrorHandler(TmpXError);
}
/* ask X to attach to the shared mem segment */
XShmAttach(d, si);
@@ -85,7 +85,7 @@ __imlib_ShmGetXImage(Display * d, Visual * v, Drawable draw, int depth,
/* wait for X to reply and do this */
XSync(d, False);
/* reset the error handler */
- XSetErrorHandler((XErrorHandler) ph);
+ XSetErrorHandler(ph);
x_does_shm = 1;
}