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