summaryrefslogtreecommitdiff
path: root/include/rabbit.hrl
diff options
context:
space:
mode:
authorVlad Alexandru Ionescu <vlad@rabbitmq.com>2010-10-14 19:15:16 +0100
committerVlad Alexandru Ionescu <vlad@rabbitmq.com>2010-10-14 19:15:16 +0100
commit99361562792325603fb7ca1a7e5886198bf079dc (patch)
tree22538055a6baabad456300a9bc0846f6924528d1 /include/rabbit.hrl
parent9c889d53cc6b8d5849e2c15d02d362c49471609d (diff)
parentb938a532cb876ea98111a3ae165f01596eaa509c (diff)
downloadrabbitmq-server-git-99361562792325603fb7ca1a7e5886198bf079dc.tar.gz
merging in from default
Diffstat (limited to 'include/rabbit.hrl')
-rw-r--r--include/rabbit.hrl6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 027643c7b3..59e39d920e 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -60,8 +60,8 @@
-record(route, {binding, value = const}).
-record(reverse_route, {reverse_binding, value = const}).
--record(binding, {exchange_name, key, queue_name, args = []}).
--record(reverse_binding, {queue_name, key, exchange_name, args = []}).
+-record(binding, {source, key, destination, args = []}).
+-record(reverse_binding, {destination, key, source, args = []}).
-record(topic_trie_edge, {trie_edge, node_id}).
-record(topic_trie_binding, {trie_binding, value = const}).
@@ -76,7 +76,7 @@
-record(ssl_socket, {tcp, ssl}).
-record(delivery, {mandatory, immediate, txn, sender, message}).
--record(amqp_error, {name, explanation, method = none}).
+-record(amqp_error, {name, explanation = "", method = none}).
-record(event, {type, props, timestamp}).