[PATCH xserver 4/7] xwin: remove always true/set XWIN_CLIPBOARD conditional/define

[Jon Turney]

On 03/08/2017 20:15, Emil Velikov wrote:
> --- a/hw/xwin/winscrinit.c
> +++ b/hw/xwin/winscrinit.c
> @@ -264,9 +264,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
>       winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
>       VisualPtr pVisual = NULL;
>   
> -#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
>       int iReturn;
> -#endif
>   
>       /* Create framebuffer */
>       if (!(*pScreenPriv->pwinInitScreen) (pScreen)) {
> @@ -504,7 +502,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
>       pScreenPriv->CloseScreen = pScreen->CloseScreen;
>       pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
>   
> -#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
>       /* Create a mutex for modules in separate threads to wait for */
>       iReturn = pthread_mutex_init(&pScreenPriv->pmServerStarted, NULL);
>       if (iReturn != 0) {

The matching #endif needs to be removed.