projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
src
/
amqp.c
diff --git
a/src/amqp.c
b/src/amqp.c
index
cf2a448
..
aba4f01
100644
(file)
--- a/
src/amqp.c
+++ b/
src/amqp.c
@@
-304,6
+304,10
@@
static int camqp_create_exchange (camqp_config_t *conf) /* {{{ */
/* type = */ amqp_cstring_bytes (conf->exchange_type),
/* passive = */ 0,
/* durable = */ 0,
/* type = */ amqp_cstring_bytes (conf->exchange_type),
/* passive = */ 0,
/* durable = */ 0,
+#if defined(AMQP_VERSION) && AMQP_VERSION >= 0x00060000
+ /* auto delete = */ 0,
+ /* internal = */ 0,
+#endif
/* arguments = */ argument_table);
if ((ed_ret == NULL) && camqp_is_error (conf))
{
/* arguments = */ argument_table);
if ((ed_ret == NULL) && camqp_is_error (conf))
{
@@
-712,7
+716,7
@@
static void *camqp_subscribe_thread (void *user_data) /* {{{ */
continue;
}
continue;
}
-
status =
camqp_read_header (conf);
+ camqp_read_header (conf);
amqp_maybe_release_buffers (conf->connection);
} /* while (subscriber_threads_running) */
amqp_maybe_release_buffers (conf->connection);
} /* while (subscriber_threads_running) */