[Bf-blender-cvs] [697d4b227e7] master: Ghost/X11: correct function signature

Campbell Barton noreply at git.blender.org
Wed Aug 8 09:53:05 CEST 2018


Commit: 697d4b227e71a6e90329e2cb4e83dafcddb4af72
Author: Campbell Barton
Date:   Wed Aug 8 17:54:41 2018 +1000
Branches: master
https://developer.blender.org/rB697d4b227e71a6e90329e2cb4e83dafcddb4af72

Ghost/X11: correct function signature

===================================================================

M	intern/ghost/intern/GHOST_WindowX11.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index dc701062df8..623d57705b2 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -598,13 +598,15 @@ GHOST_WindowX11(GHOST_SystemX11 *system,
 }
 
 #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
-static void destroyICCallback(XIC /*xic*/, XPointer ptr, XPointer /*data*/)
+static Bool destroyICCallback(XIC /*xic*/, XPointer ptr, XPointer /*data*/)
 {
 	GHOST_PRINT("XIM input context destroyed\n");
 
 	if (ptr) {
 		*(XIC *)ptr = NULL;
 	}
+	/* Ignored by X11. */
+	return True;
 }
 
 bool GHOST_WindowX11::createX11_XIC()



More information about the Bf-blender-cvs mailing list