summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2015-11-20 17:52:00 -0500
committerEdward Thomson <ethomson@edwardthomson.com>2015-11-20 17:52:00 -0500
commit7a612b53cfcd9325178597882cddada412432b18 (patch)
treec77e12fa66d0e4993ba784271e7fb633f9a7d866 /src
parent1f6c891e9517a1b82caf4be6e58b025c8f575cc3 (diff)
parenteb11fac629aa6acee934fc310621ed9a50a200fa (diff)
downloadlibgit2-7a612b53cfcd9325178597882cddada412432b18.tar.gz
Merge pull request #3514 from jacquesg/stat-fixes
Stat fixes
Diffstat (limited to 'src')
-rw-r--r--src/fileops.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/fileops.c b/src/fileops.c
index 07eb504bd..6aafd06b6 100644
--- a/src/fileops.c
+++ b/src/fileops.c
@@ -13,6 +13,12 @@
#include "win32/findfile.h"
#endif
+#ifdef GIT_USE_STAT_ATIMESPEC
+#define st_atim st_atimespec
+#define st_ctim st_ctimespec
+#define st_mtim st_mtimespec
+#endif
+
GIT__USE_STRMAP
int git_futils_mkpath2file(const char *file_path, const mode_t mode)
@@ -1034,11 +1040,7 @@ int git_futils_filestamp_check(
git_futils_filestamp *stamp, const char *path)
{
struct stat st;
-#if defined(__APPLE__)
- const struct timespec *statmtime = &st.st_mtimespec;
-#else
const struct timespec *statmtime = &st.st_mtim;
-#endif
/* if the stamp is NULL, then always reload */
if (stamp == NULL)
@@ -1080,11 +1082,7 @@ void git_futils_filestamp_set(
void git_futils_filestamp_set_from_stat(
git_futils_filestamp *stamp, struct stat *st)
{
-#if defined(__APPLE__)
- const struct timespec *statmtime = &st->st_mtimespec;
-#else
const struct timespec *statmtime = &st->st_mtim;
-#endif
if (st) {
stamp->mtime = *statmtime;