diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2017-08-22 11:48:29 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-08-22 10:59:41 -0400 |
| commit | 8f1a200d0be261a60bb9e8e72d8704cef2d91cd4 (patch) | |
| tree | ed4c80c4d932ddeb2371a8ad484fabc92f3e4f98 /hw/xwin/winvalargs.c | |
| parent | 9d00f6190a8e5cc4ebda9b315d7c0a0782b58501 (diff) | |
xwin: remove always true/set XWIN_MULTIWINDOW conditional/define
v2: drop trailing endif (Jon)
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
Diffstat (limited to 'hw/xwin/winvalargs.c')
| -rw-r--r-- | hw/xwin/winvalargs.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/hw/xwin/winvalargs.c b/hw/xwin/winvalargs.c index f93872419..50587d4b3 100644 --- a/hw/xwin/winvalargs.c +++ b/hw/xwin/winvalargs.c @@ -86,10 +86,8 @@ winValidateArgs(void) int iCount = 0; /* Count conflicting options */ -#ifdef XWIN_MULTIWINDOW if (g_ScreenInfo[i].fMultiWindow) ++iCount; -#endif #ifdef XWIN_MULTIWINDOWEXTWM if (g_ScreenInfo[i].fMWExtWM) ++iCount; @@ -112,10 +110,9 @@ winValidateArgs(void) /* Check for -multiwindow or -mwextwm and Xdmcp */ /* allow xdmcp if screen 0 is normal. */ if (g_fXdmcpEnabled && !fHasNormalScreen0 && (FALSE -#ifdef XWIN_MULTIWINDOW || g_ScreenInfo[i]. fMultiWindow -#endif + #ifdef XWIN_MULTIWINDOWEXTWM || g_ScreenInfo[i]. fMWExtWM @@ -129,9 +126,7 @@ winValidateArgs(void) /* Check for -multiwindow, -mwextwm, or -rootless and -fullscreen */ if (g_ScreenInfo[i].fFullScreen && (FALSE -#ifdef XWIN_MULTIWINDOW || g_ScreenInfo[i].fMultiWindow -#endif #ifdef XWIN_MULTIWINDOWEXTWM || g_ScreenInfo[i].fMWExtWM #endif @@ -144,9 +139,7 @@ winValidateArgs(void) /* Check for -multiwindow, -mwextwm, or -rootless and -nodecoration */ if (!g_ScreenInfo[i].fDecoration && (FALSE -#ifdef XWIN_MULTIWINDOW || g_ScreenInfo[i].fMultiWindow -#endif #ifdef XWIN_MULTIWINDOWEXTWM || g_ScreenInfo[i].fMWExtWM #endif |