diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/xnest/XNWindow.h | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xnest/XNWindow.h')
| -rw-r--r-- | xorg-server/hw/xnest/XNWindow.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/hw/xnest/XNWindow.h b/xorg-server/hw/xnest/XNWindow.h index 4cb66c8ce..b59d86a97 100644 --- a/xorg-server/hw/xnest/XNWindow.h +++ b/xorg-server/hw/xnest/XNWindow.h @@ -24,10 +24,8 @@ typedef struct { unsigned int height; unsigned int border_width; Window sibling_above; -#ifdef SHAPE RegionPtr bounding_shape; RegionPtr clip_shape; -#endif /* SHAPE */ } xnestPrivWin; typedef struct { @@ -68,9 +66,7 @@ void xnestCopyWindow(WindowPtr pWin, xPoint oldOrigin, RegionPtr oldRegion); void xnestClipNotify(WindowPtr pWin, int dx, int dy); void xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn, RegionPtr other_exposed); -#ifdef SHAPE void xnestSetShape(WindowPtr pWin); void xnestShapeWindow(WindowPtr pWin); -#endif /* SHAPE */ #endif /* XNESTWINDOW_H */ |