aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/CrPFBData.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
commitcb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch)
tree8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/CrPFBData.c
parent213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff)
parentc87efef42f76c2ff0dcfad2842ab369beffd21de (diff)
downloadvcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/CrPFBData.c')
-rw-r--r--libX11/src/CrPFBData.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libX11/src/CrPFBData.c b/libX11/src/CrPFBData.c
index e08b65c2b..8ec88abb6 100644
--- a/libX11/src/CrPFBData.c
+++ b/libX11/src/CrPFBData.c
@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
/*
* XCreatePixmapFromBitmapData: Routine to make a pixmap from user supplied bitmap data.
* D is any drawable on the same screen that the pixmap will be used in.
- * Data is a pointer to the bit data, and
+ * Data is a pointer to the bit data, and
* width & height give the size in bits of the pixmap.
* Fg and Bg are the pixel values to use for the two colors.
* Depth is the depth of the pixmap to create.
@@ -48,14 +48,14 @@ in this Software without prior written authorization from The Open Group.
* bitmap_unit=8
* xoffset=0
* no extra bytes per line
- */
+ */
Pixmap XCreatePixmapFromBitmapData(
Display *display,
Drawable d,
char *data,
- unsigned int width,
+ unsigned int width,
unsigned int height,
- unsigned long fg,
+ unsigned long fg,
unsigned long bg,
unsigned int depth)
{