diff options
| author | Edward Thomson <ethomson@github.com> | 2016-02-11 23:24:21 +0300 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-02-12 21:34:15 +0300 |
| commit | 35439f5997c41d0c50d58997c2167ee93aad6c30 (patch) | |
| tree | 131598ee3fa2374d4010828fc0407568fe80e0f8 /tests/diff | |
| parent | 263e674ec6701b774d8f464150a9d30650c6da46 (diff) | |
win32: introduce p_timeval that isn't stupid
Windows defines `timeval` with `long`, which we cannot
sanely cope with. Instead, use a custom timeval struct.
Diffstat (limited to 'tests/diff')
| -rw-r--r-- | tests/diff/workdir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c index 4c782339d..892c7b72d 100644 --- a/tests/diff/workdir.c +++ b/tests/diff/workdir.c @@ -1755,7 +1755,7 @@ void test_diff_workdir__with_stale_index(void) static int touch_file(void *payload, git_buf *path) { struct stat st; - struct timeval times[2]; + struct p_timeval times[2]; GIT_UNUSED(payload); if (git_path_isdir(path->ptr)) @@ -2006,7 +2006,7 @@ void test_diff_workdir__only_writes_index_when_necessary(void) git_oid initial, first, second; git_buf path = GIT_BUF_INIT; struct stat st; - struct timeval times[2]; + struct p_timeval times[2]; opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_UPDATE_INDEX; |