diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-24 10:55:02 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-24 10:55:02 +0200 |
commit | fad80bc4fda7edec2b6a7c19dcd1a03600646fec (patch) | |
tree | 995443565bb0c12bb06ff2bde8982ae8e4caa145 /nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | |
parent | b517b66efcbb30bb7f7add4fb5bfe48f3185b615 (diff) | |
parent | 3bd41aaf7f882cb1df4ab62a064920b797c5b41d (diff) | |
download | nx-libs-fad80bc4fda7edec2b6a7c19dcd1a03600646fec.tar.gz nx-libs-fad80bc4fda7edec2b6a7c19dcd1a03600646fec.tar.bz2 nx-libs-fad80bc4fda7edec2b6a7c19dcd1a03600646fec.zip |
Merge branch 'uli42-pr/drop_double_min_max' into 3.6.x
Attributes GH PR #724: https://github.com/ArcticaProject/nx-libs/pull/724
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keystroke.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index 61b4512fb..6def29ae4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -431,7 +431,7 @@ void nxagentDumpKeystrokes(void) { int maxlen = 0; for (int i = 0; nxagentSpecialKeystrokeNames[i]; i++) - maxlen = MAX(maxlen, strlen(nxagentSpecialKeystrokeNames[i])); + maxlen = min(maxlen, strlen(nxagentSpecialKeystrokeNames[i])); fprintf(stderr, "Current known keystrokes:\n"); |