diff options
| author | Vicent Martà <vicent@github.com> | 2013-01-11 10:59:31 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-01-11 10:59:31 -0800 |
| commit | 3f4437e714874ed10ce20fb32ca2dad3ca6f80ee (patch) | |
| tree | 7120e039fceca5871ef912101ef9dddde50bea39 /tests-clar/clar/fs.h | |
| parent | d0b14cea0e1ff09af83a801c1a9cf1a431d46d0c (diff) | |
| parent | f3738eba56cd6bafe1befea90a35a0b26600491c (diff) | |
| download | libgit2-3f4437e714874ed10ce20fb32ca2dad3ca6f80ee.tar.gz | |
Merge pull request #1227 from nulltoken/topic/emergeconflict
Introduce EMERGECONFLICT
Diffstat (limited to 'tests-clar/clar/fs.h')
| -rw-r--r-- | tests-clar/clar/fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests-clar/clar/fs.h b/tests-clar/clar/fs.h index 1cdc1ce2f..b7a1ff9d2 100644 --- a/tests-clar/clar/fs.h +++ b/tests-clar/clar/fs.h @@ -46,7 +46,7 @@ fs_rmdir_helper(WCHAR *_wsource) WCHAR buffer[MAX_PATH]; HANDLE find_handle; WIN32_FIND_DATAW find_data; - int buffer_prefix_len; + size_t buffer_prefix_len; /* Set up the buffer and capture the length */ wcscpy_s(buffer, MAX_PATH, _wsource); @@ -153,7 +153,7 @@ fs_copydir_helper(WCHAR *_wsource, WCHAR *_wdest) WCHAR buf_source[MAX_PATH], buf_dest[MAX_PATH]; HANDLE find_handle; WIN32_FIND_DATAW find_data; - int buf_source_prefix_len, buf_dest_prefix_len; + size_t buf_source_prefix_len, buf_dest_prefix_len; wcscpy_s(buf_source, MAX_PATH, _wsource); wcscat_s(buf_source, MAX_PATH, L"\\"); |