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

miss-islington · gongminmin · web-flow · commit 6da26f8cec5c · 2020-05-18T09:34:21.000-07:00
(cherry picked from commit 7f21c9a) Co-authored-by: Minmin Gong <gongminmin@msn.com>
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
@@ -0,0 +1 @@
+Move _dirnameW out of HAVE_SYMLINK to fix a potential compiling issue.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -7301,8 +7301,6 @@ win_readlink(PyObject *self, PyObject *args, PyObject *kwargs)
 
 
 
-#ifdef HAVE_SYMLINK
-
 #if defined(MS_WINDOWS)
 
 /* Grab CreateSymbolicLinkW dynamically from kernel32 */
@@ -7341,6 +7339,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)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Move _dirnameW out of HAVE_SYMLINK to fix a potential compiling issue.`