diff src/ExternalClient-Xlib.c @ 5922:4b055de36bb9 cygwin

merging heads 2
author Henry Thompson <ht@markup.co.uk>
date Fri, 27 Feb 2015 17:47:15 +0000
parents 5d5aeb79edb4
children
line wrap: on
line diff
--- a/src/ExternalClient-Xlib.c	Wed Apr 23 22:22:37 2014 +0100
+++ b/src/ExternalClient-Xlib.c	Fri Feb 27 17:47:15 2015 +0000
@@ -134,9 +134,10 @@
       else
 	return;
       XFindContext(display, win, focus_context, &current_focus);
-      if (focus_status != (int) current_focus)
+      if ((XPointer) (long) focus_status != current_focus)
 	{
-	  XSaveContext(display, win, focus_context, (XPointer) focus_status);
+	  XSaveContext(display, win, focus_context,
+		       (XPointer) (long) focus_status);
 	  extw_send_notify_3(display, win, focus_status ?
 			     extw_notify_focus_in : extw_notify_focus_out,
 			     0, 0, 0);