diff options
| author | rubidium <rubidium@openttd.org> | 2010-02-03 21:45:48 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-02-03 21:45:48 +0000 |
| commit | d818c7c7b1a1c603b108ad59ed5b97d499be6acd (patch) | |
| tree | c90cfa2848add863d59e3cdfdc95df294c740957 | |
| parent | a61cd5ad85b7d597b6193b9385ea938cd0a5be1a (diff) | |
| download | openttd-d818c7c7b1a1c603b108ad59ed5b97d499be6acd.tar.xz | |
(svn r18996) -Fix (r18993, r18994): MSVC 64 bits had somethings to complain about
| -rw-r--r-- | src/core/smallvec_type.hpp | 4 | ||||
| -rw-r--r-- | src/network/core/tcp_http.cpp | 2 | ||||
| -rw-r--r-- | src/network/network_content.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/smallvec_type.hpp b/src/core/smallvec_type.hpp index 832ba4792..0a5c982cd 100644 --- a/src/core/smallvec_type.hpp +++ b/src/core/smallvec_type.hpp @@ -79,9 +79,9 @@ public: * @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) { diff --git a/src/network/core/tcp_http.cpp b/src/network/core/tcp_http.cpp index 32c04535b..afba28fce 100644 --- a/src/network/core/tcp_http.cpp +++ b/src/network/core/tcp_http.cpp @@ -35,7 +35,7 @@ NetworkHTTPSocketHandler::NetworkHTTPSocketHandler(SOCKET s, 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); diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp index ed61fce19..1ffa2669f 100644 --- a/src/network/network_content.cpp +++ b/src/network/network_content.cpp @@ -511,7 +511,7 @@ void ClientNetworkContentSocketHandler::OnReceiveData(const char *data, size_t l 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 @@ void ClientNetworkContentSocketHandler::OnReceiveData(const char *data, size_t l 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, ','); |