diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
| commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/Misc.c | |
| parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
| parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
| download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip | |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/Misc.c')
| -rw-r--r-- | nx-X11/lib/X11/Misc.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/nx-X11/lib/X11/Misc.c b/nx-X11/lib/X11/Misc.c index 8a390320d..c3a028408 100644 --- a/nx-X11/lib/X11/Misc.c +++ b/nx-X11/lib/X11/Misc.c @@ -29,42 +29,38 @@ in this Software without prior written authorization from The Open Group. #endif #include "Xlibint.h" -long XMaxRequestSize(dpy) - Display *dpy; +long XMaxRequestSize(Display *dpy) { return dpy->max_request_size; } -char *XResourceManagerString(dpy) - Display *dpy; +char *XResourceManagerString(Display *dpy) { return dpy->xdefaults; } -unsigned long XDisplayMotionBufferSize(dpy) - Display *dpy; +unsigned long XDisplayMotionBufferSize(Display *dpy) { return dpy->motion_buffer; } int -XDisplayKeycodes(dpy, min_keycode_return, max_keycode_return) - Display *dpy; - int *min_keycode_return, *max_keycode_return; +XDisplayKeycodes( + Display *dpy, + int *min_keycode_return, + int *max_keycode_return) { *min_keycode_return = dpy->min_keycode; *max_keycode_return = dpy->max_keycode; return 1; } -VisualID XVisualIDFromVisual(visual) - Visual *visual; +VisualID XVisualIDFromVisual(Visual *visual) { return visual->visualid; } -long XExtendedMaxRequestSize(dpy) - Display *dpy; +long XExtendedMaxRequestSize(Display *dpy) { return dpy->bigreq_size; } |