summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-08-28 05:00:23 +0100
committerMatthias Radestock <matthias@lshift.net>2009-08-28 05:00:23 +0100
commit8b4a191b64db2d0de4d5cc19a9aecd337e0e5441 (patch)
tree05927e4378448f43dc575f9cb64d998134acbbfb /include
parent1e4be9b8114a89fc8fb88b5eac349fc6575dacc2 (diff)
parente0c502266bdb5f0e7d6de05cae0a731c76983bc0 (diff)
downloadrabbitmq-server-git-8b4a191b64db2d0de4d5cc19a9aecd337e0e5441.tar.gz
merge default into bug21368
Diffstat (limited to 'include')
-rw-r--r--include/rabbit.hrl4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 06564290e8..a2eae8f8f9 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -67,6 +67,7 @@
-record(dq_msg_loc, {queue_and_seq_id, is_delivered, msg_id}).
+-record(ssl_socket, {tcp, ssl}).
-record(delivery, {mandatory, immediate, txn, sender, message}).
%%----------------------------------------------------------------------------
@@ -77,7 +78,8 @@
-type(maybe(T) :: T | 'none').
-type(erlang_node() :: atom()).
--type(socket() :: port()).
+-type(ssl_socket() :: #ssl_socket{}).
+-type(socket() :: port() | ssl_socket()).
-type(thunk(T) :: fun(() -> T)).
-type(info_key() :: atom()).
-type(info() :: {info_key(), any()}).