mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
remove ULL() and LL(), because they're totally unnecessary
and sometimes harmful (used with expressions)
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
Copyright (c) 2000, 2012, Oracle and/or its affiliates.
|
||||
Copyright (c) 2009, 2013, Monty Program Ab.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -57,35 +58,35 @@ extern "C" {
|
||||
sets all high keys.
|
||||
*/
|
||||
#define MI_KEYMAP_BITS (8 * SIZEOF_LONG_LONG)
|
||||
#define MI_KEYMAP_HIGH_MASK (ULL(1) << (MI_KEYMAP_BITS - 1))
|
||||
#define MI_KEYMAP_HIGH_MASK (1ULL << (MI_KEYMAP_BITS - 1))
|
||||
#define mi_get_mask_all_keys_active(_keys_) \
|
||||
(((_keys_) < MI_KEYMAP_BITS) ? \
|
||||
((ULL(1) << (_keys_)) - ULL(1)) : \
|
||||
(~ ULL(0)))
|
||||
((1ULL << (_keys_)) - 1ULL) : \
|
||||
(~ 0ULL))
|
||||
|
||||
#if MI_MAX_KEY > MI_KEYMAP_BITS
|
||||
|
||||
#define mi_is_key_active(_keymap_,_keyno_) \
|
||||
(((_keyno_) < MI_KEYMAP_BITS) ? \
|
||||
test((_keymap_) & (ULL(1) << (_keyno_))) : \
|
||||
test((_keymap_) & (1ULL << (_keyno_))) : \
|
||||
test((_keymap_) & MI_KEYMAP_HIGH_MASK))
|
||||
#define mi_set_key_active(_keymap_,_keyno_) \
|
||||
(_keymap_)|= (((_keyno_) < MI_KEYMAP_BITS) ? \
|
||||
(ULL(1) << (_keyno_)) : \
|
||||
(1ULL << (_keyno_)) : \
|
||||
MI_KEYMAP_HIGH_MASK)
|
||||
#define mi_clear_key_active(_keymap_,_keyno_) \
|
||||
(_keymap_)&= (((_keyno_) < MI_KEYMAP_BITS) ? \
|
||||
(~ (ULL(1) << (_keyno_))) : \
|
||||
(~ (ULL(0))) /*ignore*/ )
|
||||
(~ (1ULL << (_keyno_))) : \
|
||||
(~ (0ULL)) /*ignore*/ )
|
||||
|
||||
#else
|
||||
|
||||
#define mi_is_key_active(_keymap_,_keyno_) \
|
||||
test((_keymap_) & (ULL(1) << (_keyno_)))
|
||||
test((_keymap_) & (1ULL << (_keyno_)))
|
||||
#define mi_set_key_active(_keymap_,_keyno_) \
|
||||
(_keymap_)|= (ULL(1) << (_keyno_))
|
||||
(_keymap_)|= (1ULL << (_keyno_))
|
||||
#define mi_clear_key_active(_keymap_,_keyno_) \
|
||||
(_keymap_)&= (~ (ULL(1) << (_keyno_)))
|
||||
(_keymap_)&= (~ (1ULL << (_keyno_)))
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user