From 6975333a871f976726925e8b358f22dbd92a683c Mon Sep 17 00:00:00 2001 From: Michael Steinert Date: Fri, 25 May 2012 14:09:51 -0600 Subject: Switch from stdbool.h to amqp_boolean_t Signed-off-by: Michael Steinert --- librabbitmq/amqp-openssl.c | 1 - librabbitmq/amqp.h | 3 +-- librabbitmq/amqp_url.c | 4 ++-- tools/common.c | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/librabbitmq/amqp-openssl.c b/librabbitmq/amqp-openssl.c index 781ce8a..d15bb6b 100644 --- a/librabbitmq/amqp-openssl.c +++ b/librabbitmq/amqp-openssl.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/librabbitmq/amqp.h b/librabbitmq/amqp.h index fd87bad..01158cf 100644 --- a/librabbitmq/amqp.h +++ b/librabbitmq/amqp.h @@ -136,7 +136,6 @@ typedef _W64 int ssize_t; # define AMQP_CALL #endif -#include #include #include @@ -581,7 +580,7 @@ struct amqp_connection_info { char *host; char *vhost; int port; - bool ssl; + amqp_boolean_t ssl; }; AMQP_PUBLIC_FUNCTION diff --git a/librabbitmq/amqp_url.c b/librabbitmq/amqp_url.c index 73ca4f6..ab4ac75 100644 --- a/librabbitmq/amqp_url.c +++ b/librabbitmq/amqp_url.c @@ -48,7 +48,7 @@ void amqp_default_connection_info(struct amqp_connection_info *ci) ci->host = "localhost"; ci->port = 5672; ci->vhost = "/"; - ci->ssl = false; + ci->ssl = 0; } /* Scan for the next delimiter, handling percent-encodings on the way. */ @@ -115,7 +115,7 @@ int amqp_parse_url(char *url, struct amqp_connection_info *parsed) /* do nothing */ } else if (!strncmp(url, "amqps://", 8)) { parsed->port = 5671; - parsed->ssl = true; + parsed->ssl = 1; } else { goto out; } diff --git a/tools/common.c b/tools/common.c index 2411325..8a982f8 100644 --- a/tools/common.c +++ b/tools/common.c @@ -296,7 +296,7 @@ static void init_connection_info(struct amqp_connection_info *ci) #if WITH_SSL if (amqp_ssl) { - ci->ssl = true; + ci->ssl = 1; } #endif -- cgit v1.2.1