diff options
| author | Juan Linietsky | 2014-12-16 22:33:35 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-12-16 22:33:35 -0300 |
| commit | d55f95e0d2a2f99a4130a33ad542c3682d0b92db (patch) | |
| tree | 5e413e2e81398254ac2e5d7421c5fd893ef537a7 /drivers/windows/dir_access_windows.cpp | |
| parent | bcf27feb980aec593c7cb771984e46113cfad757 (diff) | |
| parent | 1664cd67101722f0955385ed6b463f534830aeed (diff) | |
| download | godot-d55f95e0d2a2f99a4130a33ad542c3682d0b92db.tar.gz godot-d55f95e0d2a2f99a4130a33ad542c3682d0b92db.tar.zst godot-d55f95e0d2a2f99a4130a33ad542c3682d0b92db.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers/windows/dir_access_windows.cpp')
| -rw-r--r-- | drivers/windows/dir_access_windows.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index df6cc6c5e..d1e976610 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -106,6 +106,7 @@ String DirAccessWindows::get_next() { return name; } else { +#ifndef WINRT_ENABLED _cisdir=(p->fu.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); String name=p->f.cFileName; @@ -117,7 +118,8 @@ String DirAccessWindows::get_next() { } return name; - +#endif + return ""; } } @@ -358,6 +360,7 @@ bool DirAccessWindows::dir_exists(String p_dir) { return (fileAttr&FILE_ATTRIBUTE_DIRECTORY); } else { +#ifndef WINRT_ENABLED DWORD fileAttr; fileAttr = GetFileAttributesExA(p_dir.ascii().get_data(), GetFileExInfoStandard, &fileInfo); @@ -366,8 +369,8 @@ bool DirAccessWindows::dir_exists(String p_dir) { return (fileAttr&FILE_ATTRIBUTE_DIRECTORY); +#endif } - return false; } |