Commit: 577327635cee0aaf8e828f9c5039d6e25b6a6311
Author: Campbell Barton
Date: Thu Nov 13 10:58:01 2014 +0100
Branches: master
https://developer.blender.org/rB577327635cee0aaf8e828f9c5039d6e25b6a6311
GHOST/X11: correct USE_X11_ERROR_HANDLERS define
===================================================================
M intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp
b/intern/ghost/intern/GHOST_SystemX11.cpp
index 75a9223..e3baeba 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -1874,8 +1874,11 @@ GHOST_TSuccess
GHOST_SystemX11::pushDragDropEvent(GHOST_TEventType eventType,
}
#endif
-#ifdef WITH_X11_XINPUT
-/*
+#if defined(USE_X11_ERROR_HANDLERS) || defined(WITH_X11_XINPUT)
+/*
+ * These callbacks can be used for debugging, so we can breakpoint on an X11
error.
+
+ *
* Dummy function to get around IO Handler exiting if device invalid
* Basically it will not crash blender now if you have a X device that
* is configured but not plugged in.
@@ -1896,7 +1899,9 @@ int GHOST_X11_ApplicationIOErrorHandler(Display *display)
/* No exit! - but keep lint happy */
return 0;
}
+#endif
+#ifdef WITH_X11_XINPUT
/* These C functions are copied from Wine 1.1.13's wintab.c */
#define BOOL int
#define TRUE 1
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
