Merge pull request #3604 from ethomson/nsec_xplat

Handle `USE_NSECS`
This commit is contained in:
Carlos Martín Nieto 2016-02-18 15:11:31 +01:00
commit c1b75f05ad
3 changed files with 7 additions and 7 deletions

View File

@ -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

View File

@ -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)

View File

@ -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;