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

gongminmin · arturoescaip · commit aee42b8aa50a · 2020-05-24T10:50:51.000-07:00
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
@@ -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)

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.`