summaryrefslogtreecommitdiff
path: root/tools/aapt/CacheUpdater.h
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2015-08-17 21:15:40 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-17 21:15:40 +0000
commit84d4917c7560da364eb8fe79353e046807beb416 (patch)
tree209739704a79f211773a4ed6f08f78724cbe6bcc /tools/aapt/CacheUpdater.h
parentcd3f875321a30f9cc21e631fa85f7fb12901b147 (diff)
parent12cf0f9c4cf8e6aed738da7349f556bd716ec09e (diff)
am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
* commit '12cf0f9c4cf8e6aed738da7349f556bd716ec09e': Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
Diffstat (limited to 'tools/aapt/CacheUpdater.h')
-rw-r--r--tools/aapt/CacheUpdater.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/CacheUpdater.h b/tools/aapt/CacheUpdater.h
index fade53ac2629..10a1bbc2f4aa 100644
--- a/tools/aapt/CacheUpdater.h
+++ b/tools/aapt/CacheUpdater.h
@@ -12,7 +12,7 @@
#include <sys/stat.h>
#include <stdio.h>
#include "Images.h"
-#ifdef HAVE_MS_C_RUNTIME
+#ifdef _WIN32
#include <direct.h>
#endif
@@ -81,7 +81,7 @@ public:
// Advance to the next segment of the path
existsPath.appendPath(toCreate.walkPath(&remains));
toCreate = remains;
-#ifdef HAVE_MS_C_RUNTIME
+#ifdef _WIN32
_mkdir(existsPath.string());
#else
mkdir(existsPath.string(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP);