diff options
| author | Vicent Martà <tanoku@gmail.com> | 2011-09-27 11:14:23 -0700 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2011-09-27 11:14:23 -0700 |
| commit | 35e9407c4698080b29f2bcb3d379454bb0ae62bb (patch) | |
| tree | 36dff9fb1bc57c164023089e366c716f489544e9 | |
| parent | 887eaf4dc9b6f870b021ad88c881d5fcc6ccf4d1 (diff) | |
| parent | a5b0e7f8bc42e3eca72dd82ff000eb6eb92ef897 (diff) | |
| download | libgit2-35e9407c4698080b29f2bcb3d379454bb0ae62bb.tar.gz | |
Merge pull request #432 from carlosmn/msvc
Really fix MSVC
| -rw-r--r-- | deps/http-parser/http_parser.c | 2 | ||||
| -rw-r--r-- | src/config.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/deps/http-parser/http_parser.c b/deps/http-parser/http_parser.c index e9d42ce08..432a7c5dc 100644 --- a/deps/http-parser/http_parser.c +++ b/deps/http-parser/http_parser.c @@ -368,7 +368,7 @@ size_t http_parser_execute (http_parser *parser, enum state state; enum header_states header_state; uint64_t index = parser->index; - uint64_t nread = parser->nread; + uint32_t nread = parser->nread; const char *header_field_mark, *header_value_mark, *url_mark; const char *matcher; diff --git a/src/config.c b/src/config.c index a4445cac0..2b3e53589 100644 --- a/src/config.c +++ b/src/config.c @@ -352,7 +352,6 @@ static int win32_find_system(char *system_config_path) return GIT_ENOMEM; ret = ExpandEnvironmentStringsW(query, apphome_utf16, size); - free(query_utf16); if (ret == 0 || ret >= size) return git__throw(GIT_ERROR, "Failed to expand environment strings"); |