diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
| commit | cb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch) | |
| tree | 8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/CrGC.c | |
| parent | 213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff) | |
| parent | c87efef42f76c2ff0dcfad2842ab369beffd21de (diff) | |
| download | vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2 vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/CrGC.c')
| -rw-r--r-- | libX11/src/CrGC.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libX11/src/CrGC.c b/libX11/src/CrGC.c index e6aa35807..23fd279fe 100644 --- a/libX11/src/CrGC.c +++ b/libX11/src/CrGC.c @@ -150,10 +150,10 @@ _XGenerateGCList ( req->length += (nvalues = value - values); - /* + /* * note: Data is a macro that uses its arguments multiple * times, so "nvalues" is changed in a separate assignment - * statement + * statement */ nvalues <<= 2; @@ -175,7 +175,7 @@ _XUpdateGCCache ( gv->function = attr->function; gc->dirty |= GCFunction; } - + if (mask & GCPlaneMask) if (gv->plane_mask != attr->plane_mask) { gv->plane_mask = attr->plane_mask; @@ -211,7 +211,7 @@ _XUpdateGCCache ( gv->cap_style = attr->cap_style; gc->dirty |= GCCapStyle; } - + if (mask & GCJoinStyle) if (gv->join_style != attr->join_style) { gv->join_style = attr->join_style; @@ -333,7 +333,7 @@ void _XFlushGCCache( } } -void +void XFlushGC( Display *dpy, GC gc) @@ -342,6 +342,6 @@ XFlushGC( } GContext XGContextFromGC(GC gc) -{ +{ return (gc->gid); } |