aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2016-01-05 17:15:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-01-05 17:15:35 +0000
commitb11bf3f70cfefd170fb4d668b9b8fabadd8959e1 (patch)
tree2083c48b049af74cfb8e5ffa59c880c5feb13029
parentd443abf1aaa12c1b0fb82c940df60046c06aaed7 (diff)
parentc40705276673cb5906c3c21483954d7c735e7432 (diff)
downloadbuild-b11bf3f70cfefd170fb4d668b9b8fabadd8959e1.tar.gz
Merge "CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO"
-rw-r--r--libs/host/CopyFile.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/host/CopyFile.c b/libs/host/CopyFile.c
index d785dca83a..1b5572364d 100644
--- a/libs/host/CopyFile.c
+++ b/libs/host/CopyFile.c
@@ -67,7 +67,7 @@ static bool isSourceNewer(const struct stat* pSrcStat, const struct stat* pDstSt
*/
static bool isHiresMtime(const struct stat* pSrcStat)
{
-#if defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(_WIN32)
return 0;
#elif defined(MACOSX_RSRC)
return pSrcStat->st_mtimespec.tv_nsec > 0;
@@ -83,8 +83,7 @@ static bool isHiresMtime(const struct stat* pSrcStat)
*/
static bool isSameFile(const struct stat* pSrcStat, const struct stat* pDstStat)
{
-#ifndef HAVE_VALID_STAT_ST_INO
- /* TODO: suspicious, we hit this case even when compiling for linux: b/26355387 */
+#if defined(_WIN32)
(void)pSrcStat;
(void)pDstStat;
/* with MSVCRT.DLL, stat always sets st_ino to 0, and there is no simple way to */