This check here is not needed anymore for Windows (Unsupported Windows version check)

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index d8a83304cdc7ebb4400dfdedd902acc3e5c5a113..85127c3379d084d03f441e062e2c3eb456b3b8eb 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -173,26 +173,20 @@ PHPAPI int php_check_specific_open_basedir(const char *basedir, const char *path
 
        while (VCWD_REALPATH(path_tmp, resolved_name) == NULL) {
 #if defined(PHP_WIN32) || defined(HAVE_SYMLINK)
-#if defined(PHP_WIN32)
-               if (EG(windows_version_info).dwMajorVersion > 5) {
-#endif
-                       if (nesting_level == 0) {
-                               int ret;
-                               char buf[MAXPATHLEN];
+               if (nesting_level == 0) {
+                       int ret;
+                       char buf[MAXPATHLEN];
 
-                               ret = php_sys_readlink(path_tmp, buf, MAXPATHLEN - 1);
-                               if (ret < 0) {
-                                       /* not a broken symlink, move along.. */
-                               } else {
-                                       /* put the real path into the path buffer */
-                                       memcpy(path_tmp, buf, ret);
-                                       path_tmp[ret] = '\0';
-                               }
+                       ret = php_sys_readlink(path_tmp, buf, MAXPATHLEN - 1);
+                       if (ret < 0) {
+                               /* not a broken symlink, move along.. */
+                       } else {
+                               /* put the real path into the path buffer */
+                               memcpy(path_tmp, buf, ret);
+                               path_tmp[ret] = '\0';
                        }
-#if defined(PHP_WIN32)
                }
 #endif
-#endif
 
 #if defined(PHP_WIN32) || defined(NETWARE)
                path_file = strrchr(path_tmp, DEFAULT_SLASH);