mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-25 04:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-40653: Move _dirnameW out of #ifdef HAVE_SYMLINK/#endif (GH-20144)

Browse source
This commit is contained in:
Minmin Gong 2020-05-18 09:17:19 -07:00 • committed by GitHub
parent 951ab58024
commit 7f21c9ac87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2020-05-17-03-33-00.bpo-40653.WI8UGn.rst Normal file
View file

@ -0,0 +1 @@
Move _dirnameW out of HAVE_SYMLINK to fix a potential compiling issue.

8
Modules/posixmodule.c
View file

@ -8156,8 +8156,6 @@ os_readlink_impl(PyObject *module, path_t *path, int dir_fd)
} }
#endif /* defined(HAVE_READLINK) || defined(MS_WINDOWS) */ #endif /* defined(HAVE_READLINK) || defined(MS_WINDOWS) */
#ifdef HAVE_SYMLINK
#if defined(MS_WINDOWS) #if defined(MS_WINDOWS)
/* Remove the last portion of the path - return 0 on success */ /* Remove the last portion of the path - return 0 on success */
@ -8180,6 +8178,12 @@ _dirnameW(WCHAR *path)
return 0; return 0;
} }
#endif
#ifdef HAVE_SYMLINK
#if defined(MS_WINDOWS)
/* Is this path absolute? */ /* Is this path absolute? */
static int static int
_is_absW(const WCHAR *path) _is_absW(const WCHAR *path)