]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
GH-95896: posixmodule.c: fix osdefs.h inclusion to not depend on compiler (GH-95897)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sat, 26 Nov 2022 10:13:30 +0000 (02:13 -0800)
committerGitHub <noreply@github.com>
Sat, 26 Nov 2022 10:13:30 +0000 (02:13 -0800)
(cherry picked from commit ec2b76aa8b7c6313293ff9c6814e8bc31e08fcaf)

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

index f92e2ae6290ad2935c849d4a909f1e2a0bc32a72..62b81a16e806293bc5dd03496208156df8b6ba19 100644 (file)
@@ -21,6 +21,9 @@
       FSCTL_GET_REPARSE_POINT is not exported with WIN32_LEAN_AND_MEAN. */
 #  include <windows.h>
 #  include <pathcch.h>
+#  include <lmcons.h>             // UNLEN
+#  include "osdefs.h"             // SEP
+#  define HAVE_SYMLINK
 #endif
 
 #ifdef __VXWORKS__
@@ -430,18 +433,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