diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2017-08-22 11:48:30 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-08-22 10:59:41 -0400 |
| commit | 69fe6156ec6cd37657d4e5af1c6f21ebf72b8fd7 (patch) | |
| tree | c287d88785f7fcc328f172e9b84425c3420ccc2f | |
| parent | 8f1a200d0be261a60bb9e8e72d8704cef2d91cd4 (diff) | |
xwin: remove always true/set XWIN_RANDR conditional/define
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hw/xwin/Makefile.am | 6 | ||||
| -rw-r--r-- | hw/xwin/meson.build | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 3049041df..eee1257a9 100644 --- a/configure.ac +++ b/configure.ac @@ -2194,7 +2194,6 @@ AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes]) AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes]) AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && test "x$GLX" = xyes]) AM_CONDITIONAL(XWIN_WINDOWS_DRI, [test "x$XWIN" = xyes && test "x$WINDOWSDRI" = xyes]) -AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes]) dnl Darwin / OS X DDX if test "x$XQUARTZ" = xyes; then diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index b20737186..8caf82c65 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -40,11 +40,8 @@ MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la MULTIWINDOWEXTWM_CFLAGS = -I$(top_srcdir)/miext/rootless endif -if XWIN_RANDR SRCS_RANDR = \ winrandr.c -DEFS_RANDR = -DXWIN_RANDR -endif SRCS = InitInput.c \ InitOutput.c \ @@ -113,8 +110,7 @@ DEFS = \ $(DEFS_GLX_WINDOWS) \ $(DEFS_MULTIWINDOWEXTWM) \ $(DEFS_NATIVEGDI) \ - $(DEFS_PRIMARYFB) \ - $(DEFS_RANDR) + $(DEFS_PRIMARYFB) XWin_SOURCES = $(SRCS) diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build index f71de8301..87fa6c5cb 100644 --- a/hw/xwin/meson.build +++ b/hw/xwin/meson.build @@ -17,8 +17,6 @@ endif xwin_c_args = [] xwin_c_args += '-DHAVE_XWIN_CONFIG_H' xwin_c_args += '-Wno-bad-function-cast' -# XXX: these conditionals are always on and can be removed -xwin_c_args += '-DXWIN_RANDR' srcs_windows = [ 'winclipboardinit.c', |