diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
| commit | 9b15e1cfe4c6ca9862c2865c4adbc21a758e9734 (patch) | |
| tree | 13452621f70604f08fd91b1bd46ed6341dbc2ea7 /xorg-server/include/windowstr.h | |
| parent | bd13c464f728719fceb8a4918b52727ec125ea6e (diff) | |
| parent | de8397bc3d010bba24ec0c4d2e6249a769a86fc7 (diff) | |
| download | vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.gz vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.bz2 vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012
Conflicts:
xorg-server/Xext/xf86bigfont.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/os/connection.c
Diffstat (limited to 'xorg-server/include/windowstr.h')
| -rw-r--r-- | xorg-server/include/windowstr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h index 79a957e58..15a83f056 100644 --- a/xorg-server/include/windowstr.h +++ b/xorg-server/include/windowstr.h @@ -86,8 +86,8 @@ typedef struct _WindowOpt { struct _OtherClients *otherClients; /* default: NULL */ struct _GrabRec *passiveGrabs; /* default: NULL */ PropertyPtr userProps; /* default: NULL */ - unsigned long backingBitPlanes; /* default: ~0L */ - unsigned long backingPixel; /* default: 0 */ + CARD32 backingBitPlanes; /* default: ~0L */ + CARD32 backingPixel; /* default: 0 */ RegionPtr boundingShape; /* default: NULL */ RegionPtr clipShape; /* default: NULL */ RegionPtr inputShape; /* default: NULL */ |