threads / patch / 19274

patchhttp-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"

Subject: [PATCH] http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"

## tl;dr

3 messages between May 10, 2009 and May 12, 2009. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Christian Couder· May 10, 2009, 16:44 UTC · lore
As it is breaking the build when USE_CURL_MULTI is not defined.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 http-push.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
This patch applies to pu.
Show changes to http-push.c +2 −0
diff --git a/http-push.c b/http-push.c
index ef1a9f3..14f3996 100644
--- a/http-push.c
+++ b/http-push.c
@@ -2291,7 +2291,9 @@ int main(int argc, char **argv)
 		repo->url = rewritten_url;
 	}
 
+#ifdef USE_CURL_MULTI
 	is_running_queue = 0;
+#endif
 
 	/* Verify DAV compliance/lock support */
 	if (!locking_available()) {
-- 
1.6.3.rc1.112.g17e25
Tay Ray Chuan· May 11, 2009, 12:25 UTC · re: Christian Couder · lore

Re: [PATCH] http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"

Hi,

On Mon, May 11, 2009 at 12:44 AM, Christian Couder <chriscool@tuxfamily.org> wrote:

> As it is breaking the build when USE_CURL_MULTI is not defined.

thanks for catching this. By the way, how did you catch this? Are you building without USE_CURL_MULTI defined?

-- 
Cheers,
Ray Chuan
Christian Couder· May 12, 2009, 04:25 UTC · re: Tay Ray Chuan · lore

Re: [PATCH] http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue"

Hi,
Le lundi 11 mai 2009, Tay Ray Chuan a écrit :
Show 9 quoted lines
> Hi,
>
> On Mon, May 11, 2009 at 12:44 AM, Christian Couder
>
> <chriscool@tuxfamily.org> wrote:
> > As it is breaking the build when USE_CURL_MULTI is not defined.
>
> thanks for catching this. By the way, how did you catch this? Are you
> building without USE_CURL_MULTI defined?

My main development box still runs an old Kubuntu Feisty (7.04). It has some libcurl3 packages version 7.15.5-1ubuntu2.

In "/usr/include/curl/curlver.h", I have:
#define LIBCURL_VERSION_NUM 0x070f05
and in "http.h" there is:

#if LIBCURL_VERSION_NUM >= 0x071000 #define USE_CURL_MULTI #define DEFAULT_MAX_REQUESTS 5 #endif

so yes, I think USE_CURL_MULTI is not defined on my box and that's why the build failed on it.

Regards, Christian.

← back to recent threads