Skip to content

Commit 5629aee

Browse files
committed
Merge branch 'curl-options-want-long-instead-of-int-msft-git'
This topic branch has backports of cURL compile fixes in the `osx-gcc` job, plus a bonus `gvfs-helper` follow-up fix. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2 parents cb8ab25 + 89dd282 commit 5629aee

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

gvfs-helper.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2908,7 +2908,7 @@ static void do_req(const char *url_base,
29082908
slot = get_active_slot();
29092909
slot->results = &results;
29102910

2911-
curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0); /* not a HEAD request */
2911+
curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0L); /* not a HEAD request */
29122912
curl_easy_setopt(slot->curl, CURLOPT_URL, rest_url.buf);
29132913
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, params->headers);
29142914
if (curl_version_info(CURLVERSION_NOW)->version_num < 0x074b00)
@@ -2926,14 +2926,14 @@ static void do_req(const char *url_base,
29262926
curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, (long)0);
29272927

29282928
if (params->b_is_post) {
2929-
curl_easy_setopt(slot->curl, CURLOPT_POST, 1);
2929+
curl_easy_setopt(slot->curl, CURLOPT_POST, 1L);
29302930
curl_easy_setopt(slot->curl, CURLOPT_ENCODING, NULL);
29312931
curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS,
29322932
params->post_payload->buf);
29332933
curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE,
29342934
(long)params->post_payload->len);
29352935
} else {
2936-
curl_easy_setopt(slot->curl, CURLOPT_POST, 0);
2936+
curl_easy_setopt(slot->curl, CURLOPT_POST, 0L);
29372937
}
29382938

29392939
if (params->b_write_to_file) {
@@ -2959,9 +2959,9 @@ static void do_req(const char *url_base,
29592959
curl_easy_setopt(slot->curl, CURLOPT_XFERINFOFUNCTION,
29602960
gh__curl_progress_cb);
29612961
curl_easy_setopt(slot->curl, CURLOPT_XFERINFODATA, params);
2962-
curl_easy_setopt(slot->curl, CURLOPT_NOPROGRESS, 0);
2962+
curl_easy_setopt(slot->curl, CURLOPT_NOPROGRESS, 0L);
29632963
} else {
2964-
curl_easy_setopt(slot->curl, CURLOPT_NOPROGRESS, 1);
2964+
curl_easy_setopt(slot->curl, CURLOPT_NOPROGRESS, 1L);
29652965
}
29662966

29672967
gh__run_one_slot(slot, params, status);

0 commit comments

Comments
 (0)