From c0b40ffedbd5fa8ce0e7fe2e7cbf5bdf0c4b0ea1 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Thu, 20 Apr 2017 12:39:35 +0300 Subject: [PATCH] Remove callbacks-related hacks from samples/libcurl --- samples/libcurl/callbacks.h | 5 ----- samples/libcurl/libcurl.def | 2 +- samples/libcurl/src/org/konan/libcurl/CUrl.kt | 2 +- samples/libcurl/src/org/konan/libcurl/Program.kt | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 100755 samples/libcurl/callbacks.h diff --git a/samples/libcurl/callbacks.h b/samples/libcurl/callbacks.h deleted file mode 100755 index ed1c7bbcb3e..00000000000 --- a/samples/libcurl/callbacks.h +++ /dev/null @@ -1,5 +0,0 @@ -#include - -// Those types are needed but not defined or used in libcurl headers. -typedef size_t header_callback(char *buffer, size_t size, size_t nitems, void *userdata); -typedef size_t write_data_callback(void *buffer, size_t size, size_t nmemb, void *userp); diff --git a/samples/libcurl/libcurl.def b/samples/libcurl/libcurl.def index 1305a1b5348..3913c5c32a2 100755 --- a/samples/libcurl/libcurl.def +++ b/samples/libcurl/libcurl.def @@ -1,2 +1,2 @@ -headers = curl/curl.h callbacks.h +headers = curl/curl.h excludedFunctions = zopen pfctlinput diff --git a/samples/libcurl/src/org/konan/libcurl/CUrl.kt b/samples/libcurl/src/org/konan/libcurl/CUrl.kt index 62c05204c22..26fd041bcde 100755 --- a/samples/libcurl/src/org/konan/libcurl/CUrl.kt +++ b/samples/libcurl/src/org/konan/libcurl/CUrl.kt @@ -10,7 +10,7 @@ class CUrl(val url: String) { init { curl_easy_setopt(curl, CURLOPT_URL, url) - val header: CPointer = staticCFunction(::header_callback) + val header = staticCFunction(::header_callback) curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header) curl_easy_setopt(curl, CURLOPT_HEADERDATA, stablePtr.value) } diff --git a/samples/libcurl/src/org/konan/libcurl/Program.kt b/samples/libcurl/src/org/konan/libcurl/Program.kt index 9a4a00334ae..e709cd6f019 100755 --- a/samples/libcurl/src/org/konan/libcurl/Program.kt +++ b/samples/libcurl/src/org/konan/libcurl/Program.kt @@ -12,7 +12,7 @@ fun main(args: Array) { curl.close() /* - val write_data: CPointer = staticCFunction(::write_data) + val write_data = staticCFunction(::write_data) curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); */ }