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/Events.h | |
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/Events.h')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Events.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h index 85f585e1f..6df5725d4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h @@ -68,9 +68,9 @@ typedef int (*GetResourceFuncPtr)(Display*); int nxagentWaitForResource(GetResourceFuncPtr, PredicateFuncPtr); -Bool nxagentCollectGrabPointerPredicate(Display *display, XEvent *X, XPointer ptr); +Bool nxagentCollectGrabPointerPredicate(Display *disp, XEvent *X, XPointer ptr); -int nxagentInputEventPredicate(Display *display, XEvent *event, XPointer parameter); +int nxagentInputEventPredicate(Display *disp, XEvent *event, XPointer parameter); /* * Enable and disable notification of |