summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-06-08 11:56:43 +0100
committerMatthew Sackman <matthew@lshift.net>2009-06-08 11:56:43 +0100
commit117927964abd1adefc23fbab4b873d6e5b15b99f (patch)
tree4ca511e30b6119c3a8cdf5a75bc9739f2a1ad68d /include
parent7242b9aed25e91b536014f85042b3ac9a3c92fa9 (diff)
parent2f4f19b38956afc27ab2075d2348ab14af04016c (diff)
downloadrabbitmq-server-git-117927964abd1adefc23fbab4b873d6e5b15b99f.tar.gz
merge in default, post the bug20782 merge. All the tests still pass and the test in comment #4 of bug20782 also has correct behaviour.
Diffstat (limited to 'include')
-rw-r--r--include/rabbit.hrl8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 50ddafbaef..a28409311c 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -66,6 +66,8 @@
-record(dq_msg_loc, {queue_and_seq_id, is_delivered, msg_id, next_seq_id}).
+-record(delivery, {mandatory, immediate, txn, sender, message}).
+
%%----------------------------------------------------------------------------
-ifdef(use_specs).
@@ -137,6 +139,12 @@
guid :: guid(),
is_persistent :: bool()}).
-type(message() :: basic_message()).
+-type(delivery() ::
+ #delivery{mandatory :: bool(),
+ immediate :: bool(),
+ txn :: maybe(txn()),
+ sender :: pid(),
+ message :: message()}).
%% this really should be an abstract type
-type(msg_id() :: non_neg_integer()).
-type(msg() :: {queue_name(), pid(), msg_id(), bool(), message()}).