From: Sebastian Harl <sh@tokkee.org>
Date: Mon, 13 Jan 2014 14:46:43 +0000 (+0100)
Subject: amqp plugin: Fixed compilation when using rabbitmq-c < 0.4.
X-Git-Tag: collectd-5.4.1~1^2~1^2~3
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=3496d684b96cb1bb87f67dfc7f2c7035042878f8;p=collectd.git

amqp plugin: Fixed compilation when using rabbitmq-c < 0.4.

Thanks to Marc Fournier for noticing!
---

diff --git a/src/amqp.c b/src/amqp.c
index bebaea7c..7de9d7f2 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -44,11 +44,13 @@
 #ifdef HAVE_AMQP_SOCKET_H
 # include <amqp_socket.h>
 #endif
+#ifdef HAVE_AMQP_TCP_SOCKET
 #if defined HAVE_DECL_AMQP_SOCKET_CLOSE && !HAVE_DECL_AMQP_SOCKET_CLOSE
 /* rabbitmq-c does not currently ship amqp_socket.h
  * and, thus, does not define this function. */
 int amqp_socket_close(amqp_socket_t *);
 #endif
+#endif
 
 /* Defines for the delivery mode. I have no idea why they're not defined by the
  * library.. */
@@ -445,7 +447,7 @@ static int camqp_connect (camqp_config_t *conf) /* {{{ */
         return (status);
     }
 #else /* HAVE_AMQP_TCP_SOCKET */
-# define CLOSE_SOCKET close(sockfd)
+# define CLOSE_SOCKET() close(sockfd)
     /* this interface is deprecated as of rabbitmq-c 0.4 */
     sockfd = amqp_open_socket (CONF(conf, host), conf->port);
     if (sockfd < 0)