frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Emil Velikov 2017-08-22 11:48:30 +01:00 committed by Adam Jackson
parent 8f1a200d0b
commit 69fe6156ec
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -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_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_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_WINDOWS_DRI, [test "x$XWIN" = xyes && test "x$WINDOWSDRI" = xyes])
AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])
dnl Darwin / OS X DDX dnl Darwin / OS X DDX
if test "x$XQUARTZ" = xyes; then if test "x$XQUARTZ" = xyes; then

6
hw/xwin/Makefile.am
View File

@ -40,11 +40,8 @@ MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la
MULTIWINDOWEXTWM_CFLAGS = -I$(top_srcdir)/miext/rootless MULTIWINDOWEXTWM_CFLAGS = -I$(top_srcdir)/miext/rootless
endif endif
if XWIN_RANDR
SRCS_RANDR = \ SRCS_RANDR = \
winrandr.c winrandr.c
DEFS_RANDR = -DXWIN_RANDR
endif
SRCS = InitInput.c \ SRCS = InitInput.c \
InitOutput.c \ InitOutput.c \
@ -113,8 +110,7 @@ DEFS = \
$(DEFS_GLX_WINDOWS) \ $(DEFS_GLX_WINDOWS) \
$(DEFS_MULTIWINDOWEXTWM) \ $(DEFS_MULTIWINDOWEXTWM) \
$(DEFS_NATIVEGDI) \ $(DEFS_NATIVEGDI) \
$(DEFS_PRIMARYFB) \ $(DEFS_PRIMARYFB)
$(DEFS_RANDR)
XWin_SOURCES = $(SRCS) XWin_SOURCES = $(SRCS)

2
hw/xwin/meson.build
View File

@ -17,8 +17,6 @@ endif
xwin_c_args = [] xwin_c_args = []
xwin_c_args += '-DHAVE_XWIN_CONFIG_H' xwin_c_args += '-DHAVE_XWIN_CONFIG_H'
xwin_c_args += '-Wno-bad-function-cast' xwin_c_args += '-Wno-bad-function-cast'
# XXX: these conditionals are always on and can be removed
xwin_c_args += '-DXWIN_RANDR'
srcs_windows = [ srcs_windows = [
'winclipboardinit.c', 'winclipboardinit.c',