summaryrefslogtreecommitdiff
path: root/include/rabbit.hrl
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2010-10-25 22:29:37 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2010-10-25 22:29:37 +0100
commit740877e7eaf73d4976db445c0b27f39a6c19f1c3 (patch)
tree5bd18b9e086a3407b28e032b375046f7e1a61028 /include/rabbit.hrl
parentd7354c96df639f127b020f8a43f87adad212fe5d (diff)
parent6acde84ca164645d554de58cc68f0ef0ab9035ad (diff)
downloadrabbitmq-server-git-740877e7eaf73d4976db445c0b27f39a6c19f1c3.tar.gz
merge from default again
Diffstat (limited to 'include/rabbit.hrl')
-rw-r--r--include/rabbit.hrl7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index ae672fc908..df22b5738b 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -69,12 +69,13 @@
is_persistent}).
-record(ssl_socket, {tcp, ssl}).
--record(delivery, {mandatory, immediate, txn, sender, message}).
--record(amqp_error, {name, explanation = "", method = none}).
+-record(delivery, {mandatory, immediate, txn, sender, message,
+ origin, msg_seq_no}).
+-record(amqp_error, {name, explanation, method = none}).
-record(event, {type, props, timestamp}).
--record(message_properties, {expiry}).
+-record(message_properties, {expiry, needs_confirming = false}).
%%----------------------------------------------------------------------------