diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-13 17:04:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-13 17:04:47 +0100 |
| commit | e2e1bdced7e09e39fed613dae1f2f3096cb18118 (patch) | |
| tree | 63c7066c79d1053c7656b6175e22e2ced6f11e01 /xorg-server/include/windowstr.h | |
| parent | cc96d00cae473f472e371328ce8dc572ad258073 (diff) | |
| parent | 5cfbe97cd797d8f78ece208bb5114704b83d8aab (diff) | |
| download | vcxsrv-e2e1bdced7e09e39fed613dae1f2f3096cb18118.tar.gz vcxsrv-e2e1bdced7e09e39fed613dae1f2f3096cb18118.tar.bz2 vcxsrv-e2e1bdced7e09e39fed613dae1f2f3096cb18118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_auth.c
libxcb/src/xcb_conn.c
libxcb/src/xcb_out.c
libxcb/src/xcb_util.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/include/misc.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 d5640213e..04553f831 100644 --- a/xorg-server/include/windowstr.h +++ b/xorg-server/include/windowstr.h @@ -87,8 +87,8 @@ typedef struct _WindowOpt { struct _OtherClients *otherClients; /* default: NULL */ struct _GrabRec *passiveGrabs; /* default: NULL */ PropertyPtr userProps; /* default: NULL */ - CARD32 backingBitPlanes; /* default: ~0L */ - CARD32 backingPixel; /* default: 0 */ + unsigned long backingBitPlanes; /* default: ~0L */ + unsigned long backingPixel; /* default: 0 */ RegionPtr boundingShape; /* default: NULL */ RegionPtr clipShape; /* default: NULL */ RegionPtr inputShape; /* default: NULL */ |