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

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

View file

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

View file

@ -8156,8 +8156,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 */
@ -8180,6 +8178,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)