From 82c3120d3fa9fc6d7172e91692d121b8ba297d4d Mon Sep 17 00:00:00 2001 From: Minmin Gong Date: Mon, 18 May 2020 09:17:19 -0700 Subject: [PATCH] bpo-40653: Move _dirnameW out of GH-ifdef HAVE_SYMLINK/GH-endif (GH-20144) (cherry picked from commit 7f21c9ac872acc2114aee3313d132b016550ff42) Co-authored-by: Minmin Gong --- .../next/Build/2020-05-17-03-33-00.bpo-40653.WI8UGn.rst | 1 + Modules/posixmodule.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2020-05-17-03-33-00.bpo-40653.WI8UGn.rst diff --git a/Misc/NEWS.d/next/Build/2020-05-17-03-33-00.bpo-40653.WI8UGn.rst b/Misc/NEWS.d/next/Build/2020-05-17-03-33-00.bpo-40653.WI8UGn.rst new file mode 100644 index 00000000000000..1e6c5cb32b722a --- /dev/null +++ b/Misc/NEWS.d/next/Build/2020-05-17-03-33-00.bpo-40653.WI8UGn.rst @@ -0,0 +1 @@ +Move _dirnameW out of HAVE_SYMLINK to fix a potential compiling issue. \ No newline at end of file diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index eb0b56aebbaa36..726e3723f99d39 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -8019,8 +8019,6 @@ os_readlink_impl(PyObject *module, path_t *path, int dir_fd) } #endif /* defined(HAVE_READLINK) || defined(MS_WINDOWS) */ -#ifdef HAVE_SYMLINK - #if defined(MS_WINDOWS) /* Remove the last portion of the path - return 0 on success */ @@ -8043,6 +8041,12 @@ _dirnameW(WCHAR *path) return 0; } +#endif + +#ifdef HAVE_SYMLINK + +#if defined(MS_WINDOWS) + /* Is this path absolute? */ static int _is_absW(const WCHAR *path)