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/SetState.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/SetState.c')
-rw-r--r-- | nx-X11/lib/X11/SetState.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nx-X11/lib/X11/SetState.c b/nx-X11/lib/X11/SetState.c index c37442bb2..e5aa21c05 100644 --- a/nx-X11/lib/X11/SetState.c +++ b/nx-X11/lib/X11/SetState.c @@ -30,12 +30,13 @@ in this Software without prior written authorization from The Open Group. #include "Xlibint.h" int -XSetState(dpy, gc, foreground, background, function, planemask) -register Display *dpy; -GC gc; -int function; -unsigned long planemask; -unsigned long foreground, background; +XSetState( + register Display *dpy, + GC gc, + unsigned long foreground, + unsigned long background, + int function, + unsigned long planemask) { XGCValues *gv = &gc->values; |