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/winprocarg.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/winprocarg.c')
| -rw-r--r-- | hw/xwin/winprocarg.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 64d07cc6e..803e78f93 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -130,12 +130,8 @@ winInitializeScreenDefaults(void) defaultScreenInfo.fMWExtWM = FALSE; #endif defaultScreenInfo.fRootless = FALSE; -#ifdef XWIN_MULTIWINDOW defaultScreenInfo.fMultiWindow = FALSE; -#endif -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) defaultScreenInfo.fMultiMonitorOverride = FALSE; -#endif defaultScreenInfo.fMultipleMonitors = FALSE; defaultScreenInfo.fLessPointer = FALSE; defaultScreenInfo.iResizeMode = resizeDefault; @@ -524,10 +520,8 @@ ddxProcessArgument(int argc, char *argv[], int i) * Look for the '-fullscreen' argument */ if (IS_OPTION("-fullscreen")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) if (!screenInfoPtr->fMultiMonitorOverride) screenInfoPtr->fMultipleMonitors = FALSE; -#endif screenInfoPtr->fFullScreen = TRUE; /* Indicate that we have processed this argument */ @@ -548,10 +542,8 @@ ddxProcessArgument(int argc, char *argv[], int i) * Look for the '-nodecoration' argument */ if (IS_OPTION("-nodecoration")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) if (!screenInfoPtr->fMultiMonitorOverride) screenInfoPtr->fMultipleMonitors = FALSE; -#endif screenInfoPtr->fDecoration = FALSE; /* Indicate that we have processed this argument */ @@ -585,40 +577,32 @@ ddxProcessArgument(int argc, char *argv[], int i) * Look for the '-rootless' argument */ if (IS_OPTION("-rootless")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) if (!screenInfoPtr->fMultiMonitorOverride) screenInfoPtr->fMultipleMonitors = FALSE; -#endif screenInfoPtr->fRootless = TRUE; /* Indicate that we have processed this argument */ return 1; } -#ifdef XWIN_MULTIWINDOW /* * Look for the '-multiwindow' argument */ if (IS_OPTION("-multiwindow")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) if (!screenInfoPtr->fMultiMonitorOverride) screenInfoPtr->fMultipleMonitors = TRUE; -#endif screenInfoPtr->fMultiWindow = TRUE; /* Indicate that we have processed this argument */ return 1; } -#endif /* * Look for the '-multiplemonitors' argument */ if (IS_OPTION("-multiplemonitors") || IS_OPTION("-multimonitors")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) screenInfoPtr->fMultiMonitorOverride = TRUE; -#endif screenInfoPtr->fMultipleMonitors = TRUE; /* Indicate that we have processed this argument */ @@ -630,9 +614,7 @@ ddxProcessArgument(int argc, char *argv[], int i) */ if (IS_OPTION("-nomultiplemonitors") || IS_OPTION("-nomultimonitors")) { -#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM) screenInfoPtr->fMultiMonitorOverride = TRUE; -#endif screenInfoPtr->fMultipleMonitors = FALSE; /* Indicate that we have processed this argument */ |