diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-11-13 12:58:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-13 12:58:01 +0300 |
| commit | 577327635cee0aaf8e828f9c5039d6e25b6a6311 (patch) | |
| tree | cfba44dcd324fb371665eadf281786155b33fdf2 | |
| parent | cbf76d165f968c10ab74980de0d6f8865d839f54 (diff) | |
GHOST/X11: correct USE_X11_ERROR_HANDLERS define
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 75a9223d6a3..e3baebace0d 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 |