diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-30 10:59:17 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-30 10:59:17 +0100 |
| commit | c8d69ebaeed8005d38c91613ab699747f45b2228 (patch) | |
| tree | cd93f7cdaa242660d2c19ea5514cd3f674aaeb75 /nx-X11/programs/Xserver/hw/nxagent/Split.c | |
| parent | 105cd2be6dfce3579cb585a8d78f655f19cef57b (diff) | |
| parent | 4821edfe0ecc2296745c4c5fcaa4c08245673c6e (diff) | |
| download | nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.gz nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.bz2 nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.zip | |
Merge branch 'uli42-pr/fix_shadowed_vars' into 3.6.x
Attributes GH PR #895: https://github.com/ArcticaProject/nx-libs/pull/895
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Split.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Split.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c index 4dac8f5b2..850056c21 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -780,7 +780,7 @@ void nxagentWaitDrawable(DrawablePtr pDrawable) } } -static Bool nxagentCommitSplitPredicate(Display *display, XEvent *event, XPointer ptr) +static Bool nxagentCommitSplitPredicate(Display *disp, XEvent *event, XPointer ptr) { return (event -> type == ClientMessage && event -> xclient.data.l[0] == NXCommitSplitNotify && @@ -820,7 +820,7 @@ void nxagentWaitCommitEvent(int resource) } } -static Bool nxagentWaitSplitPredicate(Display *display, XEvent *event, XPointer ptr) +static Bool nxagentWaitSplitPredicate(Display *disp, XEvent *event, XPointer ptr) { return (event -> type == ClientMessage && (event -> xclient.data.l[0] == NXNoSplitNotify || |