summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2008-12-01 23:43:04 +0000
committerMatthias Radestock <matthias@lshift.net>2008-12-01 23:43:04 +0000
commitc58a08a9e0c272cadff9a15796512f5ef9205ff4 (patch)
tree2d7c07b1ecabf7a6e04f6489eed2e374849ffe77 /include
parent52e050de64fd366f3a306169a70d92288a15a065 (diff)
parent4029615d25b0b6160eab6a61cd09d2e8e6c98e89 (diff)
downloadrabbitmq-server-git-c58a08a9e0c272cadff9a15796512f5ef9205ff4.tar.gz
merge default into bug19684
and adapt the new rabbit_control functions to use Inform
Diffstat (limited to 'include')
-rw-r--r--include/rabbit.hrl4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 267e018b44..a79081aa21 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -63,7 +63,7 @@
-include("rabbit_framing_spec.hrl").
-type(maybe(T) :: T | 'none').
--type(node() :: atom()).
+-type(erlang_node() :: atom()).
-type(socket() :: port()).
-type(thunk(T) :: fun(() -> T)).
-type(info_key() :: atom()).
@@ -125,7 +125,7 @@
-type(msg_id() :: non_neg_integer()).
-type(msg() :: {queue_name(), pid(), msg_id(), bool(), message()}).
-type(listener() ::
- #listener{node :: node(),
+ #listener{node :: erlang_node(),
protocol :: atom(),
host :: string() | atom(),
port :: non_neg_integer()}).