[PATCH] rootless: Remove ROOTLESS_WORKAROUND

[Jon TURNEY]

On 16/08/2010 04:11, Jeremy Huddleston wrote:
>
> This was already removed for XWin (20701522be803fe47e921fcf059dadf64c7f287d)
> with no reported side effects.  XQuartz seems to be behaving ok without it as
> well.  While this possibly brings back bug #1168, we don't have any reproduction
> steps for that issue, and if it crops up again, we should fix it a real way
> rather than this hokey workaround which doesn't even work for COMPOSITE.
>
> Signed-off-by: Jeremy Huddleston<jeremyhu at apple.com>

Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>

You might wish to note in the commit message that this is effectively a revert 
of commits b2135e58 and d7fef522

> ---
>   configure.ac          |    2 +-
>   miext/damage/damage.c |    6 +-----
>   2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 1f4eb34..7db4437 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1926,7 +1926,7 @@ if test "x$XQUARTZ" = xyes; then
>
>   	AC_CHECK_LIB([Xplugin],[xp_init],[:])
>
> -	CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA"
> +	CFLAGS="${CFLAGS} -DROOTLESS_SAFEALPHA -DNO_ALLOCA"
>
>   	PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)
>
> diff --git a/miext/damage/damage.c b/miext/damage/damage.c
> index 1cf0513..e0e96f2 100644
> --- a/miext/damage/damage.c
> +++ b/miext/damage/damage.c
> @@ -89,11 +89,7 @@ getDrawableDamageRef (DrawablePtr pDrawable)
>   	ScreenPtr   pScreen = pDrawable->pScreen;
>
>   	pPixmap = 0;
> -	if (pScreen->GetWindowPixmap
> -#ifdef ROOTLESS_WORKAROUND
> -	&&  ((WindowPtr)pDrawable)->viewable
> -#endif
> -	    )
> +	if (pScreen->GetWindowPixmap)
>   	    pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable);
>
>   	if (!pPixmap)