Mercurial > hg > openttd
changeset 14439:389cabfcbd97 draft
(svn r18996) -Fix (r18993, r18994): MSVC 64 bits had somethings to complain about
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Wed, 03 Feb 2010 21:45:48 +0000 |
| parents | fd78717af07a |
| children | 0dc8e55a90ed |
| files | src/core/smallvec_type.hpp src/network/core/tcp_http.cpp src/network/network_content.cpp |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/smallvec_type.hpp +++ b/src/core/smallvec_type.hpp @@ -79,9 +79,9 @@ * @param to_add the number of items to append * @return pointer to newly allocated item */ - FORCEINLINE T *Append(size_t to_add = 1) + FORCEINLINE T *Append(uint to_add = 1) { - size_t begin = this->items; + uint begin = this->items; this->items += to_add; if (this->items > this->capacity) {
--- a/src/network/core/tcp_http.cpp +++ b/src/network/core/tcp_http.cpp @@ -35,7 +35,7 @@ redirect_depth(depth), sock(s) { - int bufferSize = strlen(url) + strlen(host) + strlen(_openttd_revision) + (data == NULL ? 0 : strlen(data)) + 128; + size_t bufferSize = strlen(url) + strlen(host) + strlen(_openttd_revision) + (data == NULL ? 0 : strlen(data)) + 128; char *buffer = AllocaM(char, bufferSize); DEBUG(net, 7, "[tcp/http] requesting %s%s", host, url);
--- a/src/network/network_content.cpp +++ b/src/network/network_content.cpp @@ -511,7 +511,7 @@ if (this->http_response_index == -1) { if (data != NULL) { /* Append the rest of the response. */ - memcpy(this->http_response.Append(length), data, length); + memcpy(this->http_response.Append((uint)length), data, length); return; } else { /* Make sure the response is properly terminated. */ @@ -563,7 +563,7 @@ check_and_terminate(p); /* Update the index for the next one */ - this->http_response_index += strlen(str) + 1; + this->http_response_index += (int)strlen(str) + 1; /* Read the ID */ p = strchr(str, ',');