[Python-checkins] GH-95896: posixmodule.c: fix osdefs.h inclusion to not depend on compiler (GH-95897)
miss-islington
webhook-mailer at python.org
Sat Nov 26 05:13:35 EST 2022
https://github.com/python/cpython/commit/610b7798af40e1457b884c91997219cf75637a04
commit: 610b7798af40e1457b884c91997219cf75637a04
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022年11月26日T02:13:30-08:00
summary:
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 at users.noreply.github.com>
Co-authored-by: Steve Dower <steve.dower at python.org>
files:
M Modules/posixmodule.c
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index f92e2ae6290a..62b81a16e806 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -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
More information about the Python-checkins
mailing list