summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-10-14 10:23:31 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-10-14 10:23:31 +0100
commitb938a532cb876ea98111a3ae165f01596eaa509c (patch)
tree52ba289805f242803ad63b93e4b529f1fed4e281 /include
parent3eed0f099b5753d5a8314d01f8ec030bb884a5b2 (diff)
parent1842114766ebc444fc44cce63bae66ad97ce13ca (diff)
downloadrabbitmq-server-git-b938a532cb876ea98111a3ae165f01596eaa509c.tar.gz
merge bug21377 into default
Diffstat (limited to 'include')
-rw-r--r--include/rabbit.hrl4
-rw-r--r--include/rabbit_exchange_type_spec.hrl4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 73a8ad972a..af6e257ade 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(listener, {node, protocol, host, port}).
diff --git a/include/rabbit_exchange_type_spec.hrl b/include/rabbit_exchange_type_spec.hrl
index cecd666b4d..ae326a872d 100644
--- a/include/rabbit_exchange_type_spec.hrl
+++ b/include/rabbit_exchange_type_spec.hrl
@@ -31,8 +31,8 @@
-ifdef(use_specs).
-spec(description/0 :: () -> [{atom(), any()}]).
--spec(publish/2 :: (rabbit_types:exchange(), rabbit_types:delivery())
- -> {rabbit_router:routing_result(), [pid()]}).
+-spec(route/2 :: (rabbit_types:exchange(), rabbit_types:delivery())
+ -> rabbit_router:match_result()).
-spec(validate/1 :: (rabbit_types:exchange()) -> 'ok').
-spec(create/1 :: (rabbit_types:exchange()) -> 'ok').
-spec(recover/2 :: (rabbit_types:exchange(),