[PATCH xserver 5/7] xwin: remove always true/set XWIN_MULTIWINDOW conditional/define

[Jon Turney]

On 03/08/2017 20:15, Emil Velikov wrote:
> --- a/hw/xwin/winscrinit.c
> +++ b/hw/xwin/winscrinit.c
> @@ -453,7 +453,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
>   #undef WRAP
>       }
>   
> -#ifdef XWIN_MULTIWINDOW
>       /* Handle multi window mode */
>       else if (pScreenInfo->fMultiWindow) {
>           /* Define the WRAP macro temporarily for local use */
> @@ -496,7 +495,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
>           /* Undefine the WRAP macro, as it is not needed elsewhere */
>   #undef WRAP
>       }
> -#endif
>   
>       /* Wrap either fb's or shadow's CloseScreen with our CloseScreen */
>       pScreenPriv->CloseScreen = pScreen->CloseScreen;
> @@ -526,12 +524,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
>       pScreenPriv->fRestacking = FALSE;
>   #endif
>   
> -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
> -    if (FALSE
> -#ifdef XWIN_MULTIWINDOW
> -        || pScreenInfo->fMultiWindow
> -#endif
> -        ) {
> +    if (pScreenInfo->fMultiWindow) {
>   #if CYGDEBUG || YES
>           winDebug("winFinishScreenInitFB - Calling winInitWM.\n");
>   #endif

Again, there's a matching #endif to remove here.