From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 26 Nov 2022 09:57:49 +0000 (-0800)
Subject: GH-95896: posixmodule.c: fix osdefs.h inclusion to not depend on compiler (GH-95897)
X-Git-Tag: v3.11.1~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e3980b49e6c089b6f9fe74bae97458c643233a9;p=thirdparty%2FPython%2Fcpython.git

GH-95896: posixmodule.c: fix osdefs.h inclusion to not depend on compiler (GH-95897)

(cherry picked from commit ec2b76aa8b7c6313293ff9c6814e8bc31e08fcaf)

Co-authored-by: TheShermanTanker <32636402+TheShermanTanker@users.noreply.github.com>
Co-authored-by: Steve Dower <steve.dower@python.org>
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 140e9b419bdb..2dfed7c583c4 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -16,6 +16,9 @@
 #ifdef MS_WINDOWS
 #  include <windows.h>
 #  include <pathcch.h>
+#  include <lmcons.h>             // UNLEN
+#  include "osdefs.h"             // SEP
+#  define HAVE_SYMLINK
 #endif
 
 #ifdef __VXWORKS__
@@ -426,18 +429,7 @@ extern char        *ctermid_r(char *);
 #  ifdef HAVE_PROCESS_H
 #    include <process.h>
 #  endif
-#  ifndef IO_REPARSE_TAG_SYMLINK
-#    define IO_REPARSE_TAG_SYMLINK (0xA000000CL)
-#  endif
-#  ifndef IO_REPARSE_TAG_MOUNT_POINT
-#    define IO_REPARSE_TAG_MOUNT_POINT (0xA0000003L)
-#  endif
-#  include "osdefs.h"             // SEP
 #  include <malloc.h>
-#  include <windows.h>
-#  include <shellapi.h>           // ShellExecute()
-#  include <lmcons.h>             // UNLEN
-#  define HAVE_SYMLINK
 #endif /* _MSC_VER */
 
 #ifndef MAXPATHLEN