From 4f67c037555be8507ff5b39bafadb4c59b9f2877 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 28 Jun 2024 22:35:47 +0200 Subject: [PATCH] (submit/miext-extinit) xfree86: vidmode: unexport noXFree86VidModeExtension and move into extension This isn't needed by any external module, so no need to export it. And those flags are better off in the corresponding extension, instead of the OS layer. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/common/xf86Extensions.h | 2 +- hw/xfree86/common/xf86VidMode.c | 2 ++ hw/xwayland/xwayland.c | 2 +- os/utils.c | 4 ---- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/xfree86/common/xf86Extensions.h b/hw/xfree86/common/xf86Extensions.h index 6e9f8832d..6b5024c01 100644 --- a/hw/xfree86/common/xf86Extensions.h +++ b/hw/xfree86/common/xf86Extensions.h @@ -41,7 +41,7 @@ void DRI2ExtensionInit(void); #ifdef XF86VIDMODE #include -extern _X_EXPORT Bool noXFree86VidModeExtension; +extern Bool noXFree86VidModeExtension; extern void XFree86VidModeExtensionInit(void); #endif diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 69ee892fc..0a5ada44e 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -49,6 +49,8 @@ #include "xf86Extensions.h" #include "xf86cmap.h" +Bool noXFree86VidModeExtension = FALSE; + static vidMonitorValue xf86VidModeGetMonitorValue(ScreenPtr pScreen, int valtyp, int indx) { diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index 29ce98c03..d9dcb3c16 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -60,7 +60,7 @@ #ifdef XF86VIDMODE #include -extern _X_EXPORT Bool noXFree86VidModeExtension; +Bool noXFree86VidModeExtension = FALSE; #endif void diff --git a/os/utils.c b/os/utils.c index 9ac49aea5..8076dfe0a 100644 --- a/os/utils.c +++ b/os/utils.c @@ -120,10 +120,6 @@ __stdcall unsigned long GetTickCount(void); #include "dixstruct_priv.h" #include "dpmsproc.h" -#ifdef XF86VIDMODE -Bool noXFree86VidModeExtension = FALSE; -#endif - Bool noGEExtension = FALSE; #define X_INCLUDE_NETDB_H