diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-05 15:13:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-05 15:13:41 +0000 |
| commit | 78db264e7992131e0781bdfa5ede821305262b2d (patch) | |
| tree | 7461ae9dab5bf69f056250fc233c1ada393dc957 /X11/extensions/compositeproto.h | |
| parent | 1d2fa791e7eb383cf2818bb2e33da546edbeade9 (diff) | |
| parent | 77a4732b0637493966889fe3545966fdc12a1b5e (diff) | |
| download | vcxsrv-78db264e7992131e0781bdfa5ede821305262b2d.tar.gz vcxsrv-78db264e7992131e0781bdfa5ede821305262b2d.tar.bz2 vcxsrv-78db264e7992131e0781bdfa5ede821305262b2d.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'X11/extensions/compositeproto.h')
| -rw-r--r-- | X11/extensions/compositeproto.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/X11/extensions/compositeproto.h b/X11/extensions/compositeproto.h index c57628c9d..2e392e2eb 100644 --- a/X11/extensions/compositeproto.h +++ b/X11/extensions/compositeproto.h @@ -51,6 +51,7 @@ #define Window CARD32 #define Region CARD32 +#define Pixmap CARD32 /* * requests and replies @@ -187,5 +188,6 @@ typedef struct { #undef Window #undef Region +#undef Pixmap #endif /* _COMPOSITEPROTO_H_ */ |