File WWW-Curl-contants_fix.patch of Package perl-WWW-Curl

Overview Repositories Revisions Requests Users Attributes Meta

File WWW-Curl-contants_fix.patch of Package perl-WWW-Curl

diff -urN WWW-Curl-4.17/Curl.xs WWW-Curl-4.17-patch/Curl.xs
--- WWW-Curl-4.17/Curl.xs	2014-02-21 18:08:30.000000000 +0200
+++ WWW-Curl-4.17-patch/Curl.xs	2019-12-12 09:09:04.277903227 +0200
@@ -68,6 +68,11 @@
     struct curl_httppost * last;
 } perl_curl_form;
 
+#ifdef CURLINC_MULTI_H
+#  ifndef __CURL_MULTI_H
+#    define __CURL_MULTI_H 1
+#  endif
+#endif
 
 typedef struct {
 #ifdef __CURL_MULTI_H
@@ -360,7 +365,6 @@
 
     if (call_function) { /* We are doing a callback to perl */
         int count, status;
-        SV *sv;
 
         ENTER;
         SAVETMPS;
@@ -619,7 +623,7 @@
         ST(0) = sv_newmortal();
         sv_setref_pv(ST(0), sclass, (void*)self);
         SvREADONLY_on(SvRV(ST(0)));
-	
+	(void)(ix);
 	Newxz(self->y,1,I32);
 	if (!self->y) { croak ("out of memory"); }
 	(*self->y)++;
@@ -668,7 +672,7 @@
 	}
 	
 	if (self->callback[callback_index(CURLOPT_DEBUGFUNCTION)] || self->callback_ctx[callback_index(CURLOPT_DEBUGDATA)]) {
-		curl_easy_setopt(clone->curl, CURLOPT_DEBUGFUNCTION, debug_callback_func);
+		curl_easy_setopt(clone->curl, CURLOPT_DEBUGFUNCTION, (curl_debug_callback)debug_callback_func);
 		curl_easy_setopt(clone->curl, CURLOPT_DEBUGDATA, clone);
 	}
 
@@ -724,7 +728,7 @@
                 perl_curl_easy_register_callback(self,&(self->callback_ctx[callback_index(option)]), value);
                 break;
             case CURLOPT_DEBUGDATA:
-		curl_easy_setopt(self->curl, CURLOPT_DEBUGFUNCTION, SvOK(value) ? debug_callback_func : NULL);
+		curl_easy_setopt(self->curl, CURLOPT_DEBUGFUNCTION, (curl_debug_callback)(SvOK(value) ? debug_callback_func : NULL));
         	curl_easy_setopt(self->curl, option, SvOK(value) ? self : NULL); 
                 perl_curl_easy_register_callback(self,&(self->callback_ctx[callback_index(option)]), value);
                 break;
@@ -745,7 +749,7 @@
 		perl_curl_easy_register_callback(self,&(self->callback[callback_index(option)]), value);
 		break;
             case CURLOPT_DEBUGFUNCTION:
-		curl_easy_setopt(self->curl, option, SvOK(value) ? debug_callback_func : NULL);
+		curl_easy_setopt(self->curl, option, (curl_debug_callback)(SvOK(value) ? debug_callback_func : NULL));
 		curl_easy_setopt(self->curl, CURLOPT_DEBUGDATA, SvOK(value) ? self : NULL);
 		perl_curl_easy_register_callback(self,&(self->callback[callback_index(option)]), value);
 		break;
@@ -798,7 +802,7 @@
 
             /* tell curl to redirect STDERR - value should be a glob */
             case CURLOPT_STDERR:
-                RETVAL = curl_easy_setopt(self->curl, option, IoOFP(sv_2io(value)) );
+                RETVAL = curl_easy_setopt(self->curl, option, (FILE *)IoOFP(sv_2io(value)) );
                 break;
 
             /* not working yet... */
@@ -819,7 +823,7 @@
 		    WWW__Curl__Share wrapper;
 		    IV tmp = SvIV((SV*)SvRV(value));
 		    wrapper = INT2PTR(WWW__Curl__Share,tmp);
-		    RETVAL = curl_easy_setopt(self->curl, option, wrapper->curlsh);
+		    RETVAL = curl_easy_setopt(self->curl, option, (CURLSH *)wrapper->curlsh);
 		} else
 		    croak("value is not of type WWW::Curl::Share"); 
 		break;
@@ -955,7 +959,6 @@
 
 int
 curl_easy_cleanup(self)
-    WWW::Curl::Easy self
     CODE:
        /* does nothing anymore - cleanup is automatic when a curl handle goes out of scope */
         RETVAL = 0;
@@ -970,7 +973,6 @@
 
 SV *
 curl_easy_strerror(self, errornum)
-        WWW::Curl::Easy self
         int errornum
     CODE:
 	{
@@ -1097,7 +1099,7 @@
 	};
 	if (easy) {
 		curl_easy_getinfo(easy, CURLINFO_PRIVATE, &stashid);
-		curl_easy_setopt(easy, CURLINFO_PRIVATE, NULL);
+		curl_easy_setopt(easy, CURLINFO_PRIVATE, (curl_off_t) NULL);
 		curl_multi_remove_handle(self->curlm, easy);
 		XPUSHs(sv_2mortal(newSVpv(stashid,0)));
 		XPUSHs(sv_2mortal(newSViv(res)));
@@ -1188,7 +1190,6 @@
 
 SV *
 curl_multi_strerror(self, errornum)
-        WWW::Curl::Multi self
         int errornum
     CODE:
 	{
@@ -1265,7 +1266,6 @@
 
 SV *
 curl_share_strerror(self, errornum)
-        WWW::Curl::Share self
         int errornum
     CODE:
 	{
diff -urN WWW-Curl-4.17/Makefile.PL WWW-Curl-4.17-patch/Makefile.PL
--- WWW-Curl-4.17/Makefile.PL	2014-02-21 18:08:09.000000000 +0200
+++ WWW-Curl-4.17-patch/Makefile.PL	2019-12-12 09:10:26.967935331 +0200
@@ -127,7 +127,7 @@
     close H;
 
     for my $e (sort @syms) {
-       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
+       if($e =~ /(OBSOLETE|^CURLINC_CURL_H|^CURLINC_MULTI_H|^CURL_EXTERN|^CURL_WIN32|^CURLOPT\z|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) {
           next;
        }
        my ($group) = $e =~ m/^([^_]+_)/;
@@ -163,7 +163,7 @@
 
     # boilerplate xs constant function here
     print CURL_XS <<HERE
-static int
+static long
 constant(const char *name)
 {
     errno = 0;

Places

File WWW-Curl-contants_fix.patch of Package perl-WWW-Curl

Places