[PATCH] unifdef -B -DRENDER to always include RENDER code

Alan Coopersmith alan.coopersmith at oracle.com
Mon Apr 19 14:27:11 PDT 2010


I almost asked about why we still had #ifdef RENDER when seeing the discussion
on Tiago's patches last week, I'm not sure if there's any point in keeping the
#ifdefs any more.


> diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
> index e7dd1d9..0428f0a 100644
> --- a/hw/vfb/InitOutput.c
> +++ b/hw/vfb/InitOutput.c
> @@ -248,10 +248,8 @@ ddxUseMsg(void)
>  {
>      ErrorF("-screen scrn WxHxD     set screen's width, height, depth\n");
>      ErrorF("-pixdepths list-of-int support given pixmap depths\n");
> -#ifdef RENDER
>      ErrorF("+/-render		   turn on/of RENDER extension support"
>  	   "(default on)\n");
> -#endif

Not really part of the unifdef patch, but a second patch to do s/of/off/ in that
message would be good.

Also, you seem to have somehow pulled in some non-RENDER related changes (perhaps
because it realized the && 0 made these always-dead already?):

> diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
> index c225a44..ac30621 100755
> --- a/hw/xwin/winwin32rootless.c
> +++ b/hw/xwin/winwin32rootless.c
> @@ -894,9 +894,6 @@ winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage)
>    SIZE szWin;
>    POINT ptSrc;
>  #endif
> -#if CYGMULTIWINDOW_DEBUG && 0
> -  winDebug ("winMWExtWMUpdateRegion (%08x)\n", pRLWinPriv);
> -#endif
>  #if 0
>    szWin.cx = pRLWinPriv->dwWidth;
>    szWin.cy = pRLWinPriv->dwHeight;
> @@ -938,10 +935,6 @@ winMWExtWMDamageRects (RootlessFrameID wid, int nCount, const BoxRec *pRects,
>  {
>    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
>    const BoxRec *pEnd;
> -#if CYGMULTIWINDOW_DEBUG && 0
> -  winDebug ("winMWExtWMDamageRects (%08x, %d, %08x, %d, %d)\n",
> -	    pRLWinPriv, nCount, pRects, shift_x, shift_y);
> -#endif
>  
>    for (pEnd = pRects + nCount; pRects < pEnd; pRects++) {
>          RECT rcDmg;
> diff --git a/hw/xwin/winwin32rootlesswndproc.c b/hw/xwin/winwin32rootlesswndproc.c
> index 4d7afee..a985c20 100755
> --- a/hw/xwin/winwin32rootlesswndproc.c
> +++ b/hw/xwin/winwin32rootlesswndproc.c
> @@ -519,9 +519,6 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
>        break;
>  
>      case WM_MOUSEMOVE:
> -#if CYGMULTIWINDOW_DEBUG && 0
> -      winDebug ("winMWExtWMWindowProc - WM_MOUSEMOVE\n");
> -#endif
>        /* Unpack the client area mouse coordinates */
>        ptMouse.x = GET_X_LPARAM(lParam);
>        ptMouse.y = GET_Y_LPARAM(lParam);
> @@ -576,9 +573,6 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
>        return 0;
>        
>      case WM_NCMOUSEMOVE:
> -#if CYGMULTIWINDOW_DEBUG && 0
> -      winDebug ("winMWExtWMWindowProc - WM_NCMOUSEMOVE\n");
> -#endif
>        /*
>         * We break instead of returning 0 since we need to call
>         * DefWindowProc to get the mouse cursor changes

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list