winex11.drv: Remove XRandR 1.2 display settings handler.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winex11.drv: Remove XRandR 1.2 display settings handler.
7dd52f6d · Zhiyi Zhang · Alexandre Julliard · 9905a5a8 · 7dd52f6d · 7dd52f6d
Commit 7dd52f6d authored Jul 24, 2020 by Zhiyi Zhang Committed by Alexandre Julliard Jul 24, 2020
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 273 deletions

configure configure +0 -18

configure.ac configure.ac +0 -4

xrandr.c dlls/winex11.drv/xrandr.c +7 -248

config.h.in include/config.h.in +0 -3

No files found.
--- a/configure
+++ b/configure
@@ -12270,24 +12270,6 @@ _ACEOF
 int
 main ()
 {
-static typeof(XRRGetScreenResources) *f; if (f) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_XRRGETSCREENRESOURCES 1" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-                     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrandr.h>
-int
-main ()
-{
 static typeof(XRRGetProviderResources) *f; if (f) return 0;
  ;
  return 0;

--- a/configure.ac
+++ b/configure.ac
@@ -1255,10 +1255,6 @@ then
 #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func; if (func) return 0;]])],
                  [WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,
                    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
-#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])],
-                      [AC_DEFINE(HAVE_XRRGETSCREENRESOURCES, 1,
-                        [Define if Xrandr has the XRRGetScreenResources function])])
-                     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetProviderResources) *f; if (f) return 0;]])],
                      [AC_DEFINE(HAVE_XRRGETPROVIDERRESOURCES, 1,
                        [Define if Xrandr has the XRRGetProviderResources function])],

--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -1255,9 +1255,6 @@
 /* Define if Xrandr has the XRRGetProviderResources function */
 #undef HAVE_XRRGETPROVIDERRESOURCES

-/* Define if Xrandr has the XRRGetScreenResources function */
-#undef HAVE_XRRGETSCREENRESOURCES
-
 /* Define to 1 if you have the `y0' function. */
 #undef HAVE_Y0