Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 2 commits into from
May 18, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa52664
Move _dirnameW out of #ifdef HAVE_SYMLINK/#endif
gongminmin May 17, 2020
0455e07
📜🤖 Added by blurb_it.
blurb-it[bot] May 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Build/2020-05-17-03-33-00.bpo-40653.WI8UGn.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move _dirnameW out of HAVE_SYMLINK to fix a potential compiling issue.
8 changes: 6 additions & 2 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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)
Expand Down