diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-12 22:02:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 22:02:18 +0100 |
| commit | 36a414eb03608dcef1444230e1c29790bde9c949 (patch) | |
| tree | 6c5147f6beae3e21fcb6af35ca131ced4b418811 /platform/x11 | |
| parent | 3c376a898ae6f4b6332d732d29c44d090978b887 (diff) | |
| parent | 1c2f2a805d99c92e0a8b72dae462018b0bd277c4 (diff) | |
Merge pull request #36994 from akien-mga/typedefs-cleanup
typedefs: Cleanup unused macros and unnecessary checks
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/os_x11.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index c74981fd55..ddb5237d1b 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -2012,8 +2012,10 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) { // is correct, but the xorg developers are // not very helpful today. - ::Time tresh = ABSDIFF(peek_event.xkey.time, xkeyevent->time); - if (peek_event.type == KeyPress && tresh < 5) { +#define ABSDIFF(x, y) (((x) < (y)) ? ((y) - (x)) : ((x) - (y))) + ::Time threshold = ABSDIFF(peek_event.xkey.time, xkeyevent->time); +#undef ABSDIFF + if (peek_event.type == KeyPress && threshold < 5) { KeySym rk; XLookupString((XKeyEvent *)&peek_event, str, 256, &rk, NULL); if (rk == keysym_keycode) { |