summaryrefslogtreecommitdiff
path: root/libs/host/CopyFile.c
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2016-01-05 09:26:54 -0800
committer Elliott Hughes <enh@google.com> 2016-01-05 09:32:42 -0800
commit636c1c4a44261ac05b2bcdf035df412b6773eabb (patch)
tree53d3018ef6a618a0e64850990dac15574f590d85 /libs/host/CopyFile.c
parentb11bf3f70cfefd170fb4d668b9b8fabadd8959e1 (diff)
Clean up Mac OS hacks in acp slightly.
Change-Id: I7cba3a345cd8907ae050961cc4f173003ac90f39
Diffstat (limited to 'libs/host/CopyFile.c')
-rw-r--r--libs/host/CopyFile.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/host/CopyFile.c b/libs/host/CopyFile.c
index 1b5572364d..5be012cf3d 100644
--- a/libs/host/CopyFile.c
+++ b/libs/host/CopyFile.c
@@ -68,8 +68,8 @@ static bool isSourceNewer(const struct stat* pSrcStat, const struct stat* pDstSt
static bool isHiresMtime(const struct stat* pSrcStat)
{
#if defined(_WIN32)
- return 0;
-#elif defined(MACOSX_RSRC)
+ return 0;
+#elif defined(__APPLE__)
return pSrcStat->st_mtimespec.tv_nsec > 0;
#else
return pSrcStat->st_mtim.tv_nsec > 0;
@@ -295,7 +295,8 @@ static int copyRegular(const char* src, const char* dst, const struct stat* pSrc
if (copyResult != 0)
return -1;
-#ifdef MACOSX_RSRC
+#if defined(__APPLE__)
+ // Copy Mac OS X resource forks too.
{
char* srcRsrcName = NULL;
char* dstRsrcName = NULL;