summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-10-22 15:29:28 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-10-22 15:29:28 +0200
commit02e88e445d9960c3b248ea95d03d4a191ef91289 (patch)
treea2968418cc4aae03798376555701edf2fffc297e /src
parent087d04292a844fbfdb8d65457b1d44456e51c631 (diff)
downloadqtlocation-mapboxgl-02e88e445d9960c3b248ea95d03d4a191ef91289.tar.gz
fixes for libuv 0.11
Diffstat (limited to 'src')
-rw-r--r--src/storage/file_request_baton.cpp1
-rw-r--r--src/util/uv.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/storage/file_request_baton.cpp b/src/storage/file_request_baton.cpp
index e54b743c43..aafed82d55 100644
--- a/src/storage/file_request_baton.cpp
+++ b/src/storage/file_request_baton.cpp
@@ -83,7 +83,6 @@ void FileRequestBaton::file_stated(uv_fs_t *req) {
if (stat->st_size > std::numeric_limits<int>::max()) {
// File is too large for us to open this way because uv_buf's only support unsigned
// ints as maximum size.
- const uv_err_t error = {UV_EFBIG, 0};
if (ptr->request) {
ptr->request->response = std::unique_ptr<Response>(new Response);
ptr->request->response->code = UV_EFBIG;
diff --git a/src/util/uv.cpp b/src/util/uv.cpp
index 1e51d3dbb6..03a885d308 100644
--- a/src/util/uv.cpp
+++ b/src/util/uv.cpp
@@ -15,7 +15,7 @@ std::string cwd() {
do {
max += 256;
dir.resize(max);
- uv_cwd(const_cast<char *>(dir.data()), max);
+ uv_cwd(const_cast<char *>(dir.data()), &max);
} while (max == dir.size());
dir.resize(max - 1);
return dir;