aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/CrPixmap.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
commit051d521f6e20761ba6831cecd91883da960fa931 (patch)
treeb28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/CrPixmap.c
parent6dce607bad8711dd06a5a7b69ad1930386b4123b (diff)
parentb8de7bf654929c823080b211aeac56cd213f5a32 (diff)
downloadnx-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/CrPixmap.c')
-rw-r--r--nx-X11/lib/X11/CrPixmap.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/nx-X11/lib/X11/CrPixmap.c b/nx-X11/lib/X11/CrPixmap.c
index 648a3de3d..cdf312076 100644
--- a/nx-X11/lib/X11/CrPixmap.c
+++ b/nx-X11/lib/X11/CrPixmap.c
@@ -23,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -38,10 +37,12 @@ _XNoticeCreateBitmap (Display *dpy,
unsigned int height);
#endif
-Pixmap XCreatePixmap (dpy, d, width, height, depth)
- register Display *dpy;
- Drawable d;
- unsigned int width, height, depth;
+Pixmap XCreatePixmap (
+ register Display *dpy,
+ Drawable d,
+ unsigned int width,
+ unsigned int height,
+ unsigned int depth)
{
Pixmap pid;
register xCreatePixmapReq *req;