Merge branch 'collectd-5.5'

[collectd.git] / src / amqp.c

diff --git a/src/amqp.c b/src/amqp.c
index 3ba8225..aba4f01 100644 (file)
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -304,7 +304,7 @@ static int camqp_create_exchange (camqp_config_t *conf) /* {{{ */
             /* type        = */ amqp_cstring_bytes (conf->exchange_type),
             /* passive     = */ 0,
             /* durable     = */ 0,
-#if AMQP_VERSION >= 0x00060000
+#if defined(AMQP_VERSION) && AMQP_VERSION >= 0x00060000
             /* auto delete = */ 0,
             /* internal    = */ 0,
 #endif
@@ -716,7 +716,7 @@ static void *camqp_subscribe_thread (void *user_data) /* {{{ */
             continue;
         }
 
-        status = camqp_read_header (conf);
+        camqp_read_header (conf);
 
         amqp_maybe_release_buffers (conf->connection);
     } /* while (subscriber_threads_running) */