Fix build with newer versions of cURL

Don't rely on header guard names. Simply make a define since the header is always included.
Don't parse curl.h with perl if the cpp program (provided by gcc) is installed

1 files changed, 0 insertions, 24 deletions

diff --git a/curl-7.71.0.patch b/curl-7.71.0.patch
deleted file mode 100644
index 7ab21ef659ee..000000000000
--- a/curl-7.71.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/Curl.xs	2014-02-21 11:08:30.000000000 -0500
-+++ b/Curl.xs	2020-06-25 09:36:37.868826340 -0400
-@@ -18,6 +18,10 @@
- #include <curl/easy.h>
- #include <curl/multi.h>
- 
-+#if defined(CURLINC_MULTI_H) && !defined(__CURL_MULTI_H)
-+#   define __CURL_MULTI_H
-+#endif
-+
- #define header_callback_func writeheader_callback_func
- 
- /* Do a favor for older perl versions */
---- a/Makefile.PL	2014-02-21 11:08:09.000000000 -0500
-+++ b/Makefile.PL	2020-06-25 09:24:50.549812170 -0400
-@@ -127,7 +127,7 @@
-     close H;
- 
-     for my $e (sort @syms) {
--       if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) {
-+       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_WIN32\z|^CURLOPT\z|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) {
-           next;
-        }
-        my ($group) = $e =~ m/^([^_]+_)/;