SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge XFree86 RC2 (4.3.99.902) from vendor branch

Browse Source
This commit is contained in:
Kaleb Keithley
2003-12-20 00:28:31 +00:00
parent 4b75c7f635
commit e97c634593
46 changed files with 3589 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/regionstr.h
View File

@@ -1,4 +1,4 @@
/* $XdotOrg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.1.4.6 2003/12/06 13:24:29 kaleb Exp $ */
/* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
/***********************************************************
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12 2003/11/29 02:29:43 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
#ifndef REGIONSTRUCT_H
#define REGIONSTRUCT_H
@@ -168,18 +168,8 @@ extern RegDataRec miBrokenData;
#else /* !NEED_SCREEN_REGIONS */
/* Reference _pScreen macro argument and possibly check its type */
#undef REGION_SCREEN
extern volatile ScreenPtr currentRegionScreen;
#if defined(NDEBUG) && !defined(DEBUG) && !defined(BUILDDEBUG)
# define REGION_SCREEN(_pScreen_) (void)(_pScreen_)
#else
# define REGION_SCREEN(_pScreen_) (void)(currentRegionScreen = (_pScreen_))
#endif
/* Reference _pScreen macro argument and check its type */
#define REGION_SCREEN(_pScreen_) (void)((_pScreen_)->myNum)
#define REGION_CREATE(_pScreen, _rect, _size) \
(REGION_SCREEN(_pScreen), miRegionCreate(_rect, _size))
@@ -257,8 +247,8 @@ extern volatile ScreenPtr currentRegionScreen;
#define REGION_INIT(_pScreen, _pReg, _rect, _size) \
{ \
REGION_SCREEN(_pScreen); \
(_pReg)->extents = *(_rect); \
(_pReg)->data = (RegDataPtr)NULL; \
(_pReg)->extents = *(_rect); \
(_pReg)->data = (RegDataPtr)NULL; \
}
#define REGION_UNINIT(_pScreen, _pReg) \