summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2015-08-19 10:38:36 -0700
committer Elliott Hughes <enh@google.com> 2015-08-19 17:56:44 +0000
commit9a6ec5862c8a3ef20ac46728da75d62c4c88bae4 (patch)
treec61db36db9d36c6a21bb02f9baf3c1b70eaf582f
parent35090b322f2f198b641adb5a5af6e766b90eb1f2 (diff)
Move aapt2 off HAVE_MS_C_RUNTIME.
Change-Id: Iea75251bde4d8795213ea235db446065e1fea7b5 (cherry picked from commit c301ab8d6ab553ee0e641558f9fbe2f974a70e52)
-rw-r--r--tools/aapt2/Files.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/Files.cpp b/tools/aapt2/Files.cpp
index 8484148f29d3..b24ff6bb6291 100644
--- a/tools/aapt2/Files.cpp
+++ b/tools/aapt2/Files.cpp
@@ -22,7 +22,7 @@
#include <string>
#include <sys/stat.h>
-#ifdef HAVE_MS_C_RUNTIME
+#ifdef _WIN32
// Windows includes.
#include <direct.h>
#endif
@@ -83,7 +83,7 @@ std::vector<std::string> listFiles(const StringPiece& root) {
}
inline static int mkdirImpl(const StringPiece& path) {
-#ifdef HAVE_MS_C_RUNTIME
+#ifdef _WIN32
return _mkdir(path.toString().c_str());
#else
return mkdir(path.toString().c_str(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP);