summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-12-19 15:56:22 +0000
committerMatthew Sackman <matthew@lshift.net>2009-12-19 15:56:22 +0000
commitf0bcbed84b2fe7e9b3791f2d676ed650dd9fa2d3 (patch)
treeb6c87b536eef4189b587186e1451592089bdb58c /include
parent4b881accc7b8a43df6b67e8b462bb52faf631d1e (diff)
parent72d55a5e0fbe50f279b1230b68967289d14b96b1 (diff)
downloadrabbitmq-server-git-f0bcbed84b2fe7e9b3791f2d676ed650dd9fa2d3.tar.gz
merging default+21673 into bug 22161
Diffstat (limited to 'include')
-rw-r--r--include/rabbit_exchange_behaviour_spec.hrl41
-rw-r--r--include/rabbit_framing_spec.hrl2
2 files changed, 1 insertions, 42 deletions
diff --git a/include/rabbit_exchange_behaviour_spec.hrl b/include/rabbit_exchange_behaviour_spec.hrl
deleted file mode 100644
index 30662af84a..0000000000
--- a/include/rabbit_exchange_behaviour_spec.hrl
+++ /dev/null
@@ -1,41 +0,0 @@
-%% The contents of this file are subject to the Mozilla Public License
-%% Version 1.1 (the "License"); you may not use this file except in
-%% compliance with the License. You may obtain a copy of the License at
-%% http://www.mozilla.org/MPL/
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-%% License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% The Original Code is RabbitMQ.
-%%
-%% The Initial Developers of the Original Code are LShift Ltd,
-%% Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
-%%
-%% Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
-%% Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
-%% are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
-%% Technologies LLC, and Rabbit Technologies Ltd.
-%%
-%% Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
-%% Ltd. Portions created by Cohesive Financial Technologies LLC are
-%% Copyright (C) 2007-2009 Cohesive Financial Technologies
-%% LLC. Portions created by Rabbit Technologies Ltd are Copyright
-%% (C) 2007-2009 Rabbit Technologies Ltd.
-%%
-%% All Rights Reserved.
-%%
-%% Contributor(s): ______________________________________.
-%%
--ifdef(use_specs).
-
--spec(description/0 :: () -> [{atom(), any()}]).
--spec(publish/2 :: (exchange(), delivery()) -> {routing_result(), [pid()]}).
--spec(recover/1 :: (exchange()) -> 'ok').
--spec(init/1 :: (exchange()) -> 'ok').
--spec(delete/1 :: (exchange()) -> 'ok').
--spec(add_binding/2 :: (exchange(), binding()) -> 'ok').
--spec(delete_binding/2 :: (exchange(), binding()) -> 'ok').
-
--endif.
diff --git a/include/rabbit_framing_spec.hrl b/include/rabbit_framing_spec.hrl
index 16af8ad3bc..a78c230167 100644
--- a/include/rabbit_framing_spec.hrl
+++ b/include/rabbit_framing_spec.hrl
@@ -56,5 +56,5 @@
-type(password() :: binary()).
-type(vhost() :: binary()).
-type(ctag() :: binary()).
--type(exchange_type() :: atom()).
+-type(exchange_type() :: 'direct' | 'topic' | 'fanout').
-type(binding_key() :: binary()).