xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/parser/write.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit ff6b196d1d1e15ab8cb12c571b09afc8c609aa97
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 8 13:41:20 2024 +0100

    xfree86: parser: drop HAS_NO_UIDS
    
    It's only locally defined when WIN32 is defined, so we can use this directly.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1278>

diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
index f4aa03b3d..1c8e33dd0 100644
--- a/hw/xfree86/parser/write.c
+++ b/hw/xfree86/parser/write.c
@@ -65,10 +65,6 @@
 #include <sys/wait.h>
 #include <errno.h>
 
-#if defined(WIN32)
-#define HAS_NO_UIDS
-#endif
-
 static int
 doWriteConfigFile(const char *filename, XF86ConfigPtr cptr)
 {
@@ -126,7 +122,7 @@ doWriteConfigFile(const char *filename, XF86ConfigPtr cptr)
 int
 xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr)
 {
-#ifndef HAS_NO_UIDS
+#ifndef WIN32
     int ret;
 
     if (getuid() != geteuid()) {
@@ -149,6 +145,6 @@ xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr)
         return ret;
     }
     else
-#endif                          /* !HAS_NO_UIDS */
+#endif                          /* WIN32 */
         return doWriteConfigFile(filename, cptr);
 }