mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-27 06:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX None macro from X11 colliding with Event::None and others

Browse Source
This commit is contained in:
Benoit Favre 2014-09-09 11:08:56 +02:00 committed by David Capello
parent bdd64b2c34
commit 886ff676f6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/she/alleg4/she_alleg4.cpp
View File

@ -37,6 +37,11 @@
#endif #endif
#elif defined(ALLEGRO_UNIX) #elif defined(ALLEGRO_UNIX)
#include <xalleg.h> #include <xalleg.h>
#ifdef None
#undef None
#define X11_None 0L
#endif
#endif #endif
#ifdef WIN32 #ifdef WIN32
@ -628,7 +633,7 @@ public:
XGrabPointer(_xwin.display, _xwin.window, False, XGrabPointer(_xwin.display, _xwin.window, False,
PointerMotionMask | ButtonPressMask | ButtonReleaseMask, PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
GrabModeAsync, GrabModeAsync, GrabModeAsync, GrabModeAsync,
None, None, CurrentTime); X11_None, X11_None, CurrentTime);
#endif #endif
} }