aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-07-09 09:23:11 +0200
committermarha <marha@users.sourceforge.net>2012-07-09 09:23:11 +0200
commit75f57cf199b6c042b0f7515e3a1ab80f7ccecfab (patch)
treee0cc528599b191887512be9d04fd5a16e8d86f26
parentadab311edf18f4123f03cfa52424e4de29f4380b (diff)
downloadvcxsrv-75f57cf199b6c042b0f7515e3a1ab80f7ccecfab.tar.gz
vcxsrv-75f57cf199b6c042b0f7515e3a1ab80f7ccecfab.tar.bz2
vcxsrv-75f57cf199b6c042b0f7515e3a1ab80f7ccecfab.zip
Solved compilation errors
-rw-r--r--libX11/src/CrBFData.c24
-rw-r--r--libX11/src/CrPFBData.c30
2 files changed, 28 insertions, 26 deletions
diff --git a/libX11/src/CrBFData.c b/libX11/src/CrBFData.c
index 6708a9b91..b5c4c30b6 100644
--- a/libX11/src/CrBFData.c
+++ b/libX11/src/CrBFData.c
@@ -60,18 +60,18 @@ Pixmap XCreateBitmapFromData(
return (Pixmap) None;
} else {
XImage ximage = {
- .height = height,
- .width = width,
- .depth = 1,
- .bits_per_pixel = 1,
- .xoffset = 0,
- .format = XYPixmap,
- .data = (char *) data,
- .byte_order = LSBFirst,
- .bitmap_unit = 8,
- .bitmap_bit_order = LSBFirst,
- .bitmap_pad = 8,
- .bytes_per_line = (width + 7) / 8,
+ /*.width =*/ width,
+ /*.height =*/ height,
+ /*.xoffset =*/ 0,
+ /*.format =*/ XYPixmap,
+ /*.data =*/ (char *) data,
+ /*.byte_order =*/ LSBFirst,
+ /*.bitmap_unit =*/ 8,
+ /*.bitmap_bit_order =*/ LSBFirst,
+ /*.bitmap_pad =*/ 8,
+ /*.depth =*/ 1,
+ /*.bytes_per_line =*/ (width + 7) / 8,
+ /*.bits_per_pixel =*/ 1
};
XPutImage(display, pix, gc, &ximage, 0, 0, 0, 0, width, height);
XFreeGC(display, gc);
diff --git a/libX11/src/CrPFBData.c b/libX11/src/CrPFBData.c
index 17d551bb7..a736b9b84 100644
--- a/libX11/src/CrPFBData.c
+++ b/libX11/src/CrPFBData.c
@@ -60,8 +60,10 @@ Pixmap XCreatePixmapFromBitmapData(
{
Pixmap pix = XCreatePixmap(display, d, width, height, depth);
XGCValues gcv = {
- .foreground = fg,
- .background = bg
+ /*.function =*/ 0,
+ /*.plane_mask =*/ 0,
+ /*.foreground =*/ fg,
+ /*.background =*/ bg
};
GC gc = XCreateGC(display, pix, GCForeground|GCBackground, &gcv);
if (gc == NULL) {
@@ -69,18 +71,18 @@ Pixmap XCreatePixmapFromBitmapData(
return (Pixmap) None;
} else {
XImage ximage = {
- .height = height,
- .width = width,
- .depth = 1,
- .bits_per_pixel = 1,
- .xoffset = 0,
- .format = XYBitmap,
- .data = data,
- .byte_order = LSBFirst,
- .bitmap_unit = 8,
- .bitmap_bit_order = LSBFirst,
- .bitmap_pad = 8,
- .bytes_per_line = (width + 7) / 8
+ /*.width =*/ width,
+ /*.height =*/ height,
+ /*.xoffset =*/ 0,
+ /*.format =*/ XYBitmap,
+ /*.data =*/ data,
+ /*.byte_order =*/ LSBFirst,
+ /*.bitmap_unit =*/ 8,
+ /*.bitmap_bit_order =*/ LSBFirst,
+ /*.bitmap_pad =*/ 8,
+ /*.depth =*/ 1,
+ /*.bytes_per_line =*/ (width + 7) / 8,
+ /*.bits_per_pixel =*/ 1
};
XPutImage(display, pix, gc, &ximage, 0, 0, 0, 0, width, height);
XFreeGC(display, gc);