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/include/regionstr.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/include/regionstr.h')
-rw-r--r-- | xorg-server/include/regionstr.h | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/xorg-server/include/regionstr.h b/xorg-server/include/regionstr.h index f44cab7b0..db712f8ae 100644 --- a/xorg-server/include/regionstr.h +++ b/xorg-server/include/regionstr.h @@ -131,34 +131,9 @@ extern RegDataRec miBrokenData; #define REGION_BREAK(_pScreen, _pReg) \ miRegionBreak(_pReg) -#ifdef DONT_INLINE_REGION_OPS - -#define REGION_INIT(_pScreen, _pReg, _rect, _size) \ - miRegionInit(_pReg, _rect, _size) - -#define REGION_UNINIT(_pScreen, _pReg) \ - miRegionUninit(_pReg) - -#define REGION_RESET(_pScreen, _pReg, _pBox) \ - miRegionReset(_pReg, _pBox) - -#define REGION_NOTEMPTY(_pScreen, _pReg) \ - miRegionNotEmpty(_pReg) - -#define REGION_BROKEN(_pScreen, _pReg) \ - miRegionBroken(_pReg) - -#define REGION_EMPTY(_pScreen, _pReg) \ - miRegionEmpty(_pReg) - -#define REGION_EXTENTS(_pScreen, _pReg) \ - miRegionExtents(_pReg) - -#else /* inline certain simple region ops for performance */ - #define REGION_INIT(_pScreen, _pReg, _rect, _size) \ { \ - if (_rect) \ + if ((_rect) != NULL) \ { \ (_pReg)->extents = *(_rect); \ (_pReg)->data = (RegDataPtr)NULL; \ @@ -216,8 +191,6 @@ extern RegDataRec miBrokenData; (_pReg)->data = &miEmptyData; \ } -#endif /* DONT_INLINE_REGION_OPS */ - #ifndef REGION_NULL #define REGION_NULL(_pScreen, _pReg) \ REGION_INIT(_pScreen, _pReg, NullBox, 1) |