diff options
| author | Carlos Martín Nieto <carlosmn@github.com> | 2016-02-18 15:11:31 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <carlosmn@github.com> | 2016-02-18 15:11:31 +0100 |
| commit | c1b75f05ad48e9366e4503d5e392b840127f817f (patch) | |
| tree | 7d293f827c3489991eea8aec9d13687325292a99 | |
| parent | b85d0afd6e52c7f858d9f7fcabf9046c0f6a0708 (diff) | |
| parent | 9447b9e55a498b93668e43cf58eef33c29cc40df (diff) | |
| download | libgit2-c1b75f05ad48e9366e4503d5e392b840127f817f.tar.gz | |
Merge pull request #3604 from ethomson/nsec_xplat
Handle `USE_NSECS`
| -rw-r--r-- | src/common.h | 6 | ||||
| -rw-r--r-- | src/fileops.c | 6 | ||||
| -rw-r--r-- | src/index.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/common.h b/src/common.h index 2913baa92..bc4bdd856 100644 --- a/src/common.h +++ b/src/common.h @@ -62,6 +62,12 @@ # endif #define GIT_STDLIB_CALL +#ifdef GIT_USE_STAT_ATIMESPEC +# define st_atim st_atimespec +# define st_ctim st_ctimespec +# define st_mtim st_mtimespec +#endif + # include <arpa/inet.h> #endif diff --git a/src/fileops.c b/src/fileops.c index 6aafd06b6..150333d7a 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -13,12 +13,6 @@ #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) diff --git a/src/index.h b/src/index.h index a64c645b3..8b9b49498 100644 --- a/src/index.h +++ b/src/index.h @@ -92,7 +92,7 @@ GIT_INLINE(bool) git_index_entry_newer_than_index( /* If the timestamp is the same or newer than the index, it's racy */ #if defined(GIT_USE_NSEC) - if ((int32_t)index->stamp.tv_sec < entry->mtime.seconds) + if ((int32_t)index->stamp.mtime.tv_sec < entry->mtime.seconds) return true; else if ((int32_t)index->stamp.mtime.tv_sec > entry->mtime.seconds) return false; |