summaryrefslogtreecommitdiff
path: root/src/xkbcomp
diff options
context:
space:
mode:
authorRan Benita <ran@unusedvar.com>2019-12-27 12:34:49 +0200
committerRan Benita <ran@unusedvar.com>2019-12-27 12:34:49 +0200
commit34122f9f064bff220e066a036315daa0778cfd54 (patch)
tree5adb88e17aed98d692064f0cdd9914742b999bad /src/xkbcomp
parentade131307c7fda83707d615216831a056f9d1c98 (diff)
downloadxorg-lib-libxkbcommon-34122f9f064bff220e066a036315daa0778cfd54.tar.gz
utils: use MIN/MAX instead of min/max
min/max symbols conflict on some systems (msvc), so just use the macros. Signed-off-by: Ran Benita <ran@unusedvar.com>
Diffstat (limited to 'src/xkbcomp')
-rw-r--r--src/xkbcomp/keymap-dump.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xkbcomp/keymap-dump.c b/src/xkbcomp/keymap-dump.c
index 5aea4b5..615d49e 100644
--- a/src/xkbcomp/keymap-dump.c
+++ b/src/xkbcomp/keymap-dump.c
@@ -161,8 +161,8 @@ write_keycodes(struct xkb_keymap *keymap, struct buf *buf)
* a maximum of at least 255, else XWayland really starts hating life.
* If this is a problem and people really need strictly bounded keymaps,
* we should probably control this with a flag. */
- write_buf(buf, "\tminimum = %u;\n", min(keymap->min_key_code, 8));
- write_buf(buf, "\tmaximum = %u;\n", max(keymap->max_key_code, 255));
+ write_buf(buf, "\tminimum = %u;\n", MIN(keymap->min_key_code, 8));
+ write_buf(buf, "\tmaximum = %u;\n", MAX(keymap->max_key_code, 255));
xkb_keys_foreach(key, keymap) {
if (key->name == XKB_ATOM_NONE)