xserver: Branch 'master'

[GitLab Mirror]

 os/log.c |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 27a5c59180d50bba6d20a6e80b0cf7e0b9f4cd95
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Sep 11 12:12:59 2024 +0200

    os: drop redefining getpid() on mingw32
    
    mingw32 does does have getpid() function, so conditionally redefining
    it to _getpid() isn't necessary.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1686>

diff --git a/os/log.c b/os/log.c
index 92334e897..7972c4709 100644
--- a/os/log.c
+++ b/os/log.c
@@ -97,11 +97,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "opaque.h"
 
-#ifdef WIN32
-#include <process.h>
-#define getpid(x) _getpid(x)
-#endif
-
 #ifdef XF86BIGFONT
 #include "xf86bigfontsrv.h"
 #endif