0001-Reuse-dynbuf-symbols-for-curl-tool.patch (1772B)
1 From 0c83f671f4f2a1b556a2f6a0cfd664cd13b077e0 Mon Sep 17 00:00:00 2001 2 From: Michael Forney <mforney@mforney.org> 3 Date: Fri, 16 Oct 2020 19:09:50 -0700 4 Subject: [PATCH] Reuse dynbuf symbols for curl tool 5 6 --- 7 lib/dynbuf.h | 26 ++++++++++++-------------- 8 1 file changed, 12 insertions(+), 14 deletions(-) 9 10 diff --git a/lib/dynbuf.h b/lib/dynbuf.h 11 index 31a913019..deabeb0e6 100644 12 --- a/lib/dynbuf.h 13 +++ b/lib/dynbuf.h 14 @@ -26,23 +26,21 @@ 15 16 #include <curl/curl.h> 17 18 -#ifndef BUILDING_LIBCURL 19 /* this renames the functions so that the tool code can use the same code 20 without getting symbol collisions */ 21 -#define Curl_dyn_init(a,b) curlx_dyn_init(a,b) 22 -#define Curl_dyn_add(a,b) curlx_dyn_add(a,b) 23 -#define Curl_dyn_addn(a,b,c) curlx_dyn_addn(a,b,c) 24 -#define Curl_dyn_addf curlx_dyn_addf 25 -#define Curl_dyn_vaddf curlx_dyn_vaddf 26 -#define Curl_dyn_free(a) curlx_dyn_free(a) 27 -#define Curl_dyn_ptr(a) curlx_dyn_ptr(a) 28 -#define Curl_dyn_uptr(a) curlx_dyn_uptr(a) 29 -#define Curl_dyn_len(a) curlx_dyn_len(a) 30 -#define Curl_dyn_reset(a) curlx_dyn_reset(a) 31 -#define Curl_dyn_tail(a,b) curlx_dyn_tail(a,b) 32 -#define Curl_dyn_setlen(a,b) curlx_dyn_setlen(a,b) 33 +#define curlx_dyn_init Curl_dyn_init 34 +#define curlx_dyn_add Curl_dyn_add 35 +#define curlx_dyn_addn Curl_dyn_addn 36 +#define curlx_dyn_addf Curl_dyn_addf 37 +#define curlx_dyn_vaddf Curl_dyn_vaddf 38 +#define curlx_dyn_free Curl_dyn_free 39 +#define curlx_dyn_ptr Curl_dyn_ptr 40 +#define curlx_dyn_uptr Curl_dyn_uptr 41 +#define curlx_dyn_len Curl_dyn_len 42 +#define curlx_dyn_reset Curl_dyn_reset 43 +#define curlx_dyn_tail Curl_dyn_tail 44 +#define curlx_dyn_setlen Curl_dyn_setlen 45 #define curlx_dynbuf dynbuf /* for the struct name */ 46 -#endif 47 48 struct dynbuf { 49 char *bufr; /* point to a null-terminated allocated buffer */ 50 -- 51 2.42.0 52