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/AllPlanes.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/AllPlanes.c')
| -rw-r--r-- | nx-X11/lib/X11/AllPlanes.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/nx-X11/lib/X11/AllPlanes.c b/nx-X11/lib/X11/AllPlanes.c index 6e405f59d..b2e245387 100644 --- a/nx-X11/lib/X11/AllPlanes.c +++ b/nx-X11/lib/X11/AllPlanes.c @@ -29,15 +29,18 @@ in this Software without prior written authorization from The Open Group. #endif #include "Xlibint.h" -Status XAllocColorPlanes(dpy, cmap, contig, pixels, ncolors, nreds, ngreens, - nblues, rmask, gmask, bmask) -register Display *dpy; -Colormap cmap; -Bool contig; -unsigned long *pixels; /* LISTofCARD32 */ /* RETURN */ -int ncolors; -int nreds, ngreens, nblues; -unsigned long *rmask, *gmask, *bmask; /* CARD32 */ /* RETURN */ +Status XAllocColorPlanes( + register Display *dpy, + Colormap cmap, + Bool contig, + unsigned long *pixels, /* LISTofCARD32 */ /* RETURN */ + int ncolors, + int nreds, + int ngreens, + int nblues, + unsigned long *rmask, + unsigned long *gmask, + unsigned long *bmask) /* CARD32 */ /* RETURN */ { xAllocColorPlanesReply rep; Status status; @@ -68,4 +71,4 @@ unsigned long *rmask, *gmask, *bmask; /* CARD32 */ /* RETURN */ UnlockDisplay(dpy); SyncHandle(); return(status); -} +} |