From 5c76b3cdd7e3f9cea2e01290da01b7091ffc1730 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 21 May 2025 11:38:26 +0200
Subject: [PATCH] xfree86: xf86Priv.h: drop unused xf86sFlag field

Not actually used, so no need to keep it anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/common/xf86Globals.c | 1 -
 hw/xfree86/common/xf86Init.c    | 5 -----
 hw/xfree86/common/xf86Priv.h    | 1 -
 3 files changed, 7 deletions(-)

diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 1431f4d34..c0355607c 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -166,7 +166,6 @@ const char *xf86VisualNames[] = {
 
 /* Parameters set only from the command line */
 Bool xf86fpFlag = FALSE;
-Bool xf86sFlag = FALSE;
 Bool xf86bsEnableFlag = FALSE;
 Bool xf86bsDisableFlag = FALSE;
 Bool xf86silkenMouseDisableFlag = FALSE;
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index fa9cc12e4..ae556ee7e 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1026,11 +1026,6 @@ ddxProcessArgument(int argc, char **argv, int i)
         xf86bsEnableFlag = TRUE;
         return 0;
     }
-    /* Notice the -s flag, but allow it to pass to the dix layer */
-    if (!strcmp(argv[i], "-s")) {
-        xf86sFlag = TRUE;
-        return 0;
-    }
     if (!strcmp(argv[i], "-pixmap32") || !strcmp(argv[i], "-pixmap24")) {
         /* silently accept */
         return 1;
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 2868acfe3..d8859536a 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -38,7 +38,6 @@
 #include "xf86Privstr.h"
 #include "input.h"
 
-extern _X_EXPORT Bool xf86sFlag;
 extern _X_EXPORT Bool xf86bsEnableFlag;
 extern _X_EXPORT Bool xf86bsDisableFlag;
 extern _X_EXPORT Bool xf86silkenMouseDisableFlag;