diff options
| author | Michael Bridgen <mikeb@lshift.net> | 2010-01-29 17:39:22 +0000 |
|---|---|---|
| committer | Michael Bridgen <mikeb@lshift.net> | 2010-01-29 17:39:22 +0000 |
| commit | 98d1db4b65ec61265874247b2c4322ed7f316253 (patch) | |
| tree | 77c72994de62ac8eb532e8683877a8d252b2c71b /include | |
| parent | bc586033a279ffc7c18b40be1865d4867f94241d (diff) | |
| parent | b22d7975219f1260b22431950ce1206aab2fdba0 (diff) | |
| download | rabbitmq-server-git-98d1db4b65ec61265874247b2c4322ed7f316253.tar.gz | |
Merge from default to get an abundance of fixes; including (this is the
only non-conflict resolution) pre->enables and post->requires.
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 4b157cbc46..38d8c89974 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -128,11 +128,17 @@ properties :: amqp_properties(), properties_bin :: 'none', payload_fragments_rev :: [binary()]}). +-type(unencoded_content() :: undecoded_content()). -type(decoded_content() :: #content{class_id :: amqp_class_id(), properties :: amqp_properties(), properties_bin :: maybe(binary()), payload_fragments_rev :: [binary()]}). +-type(encoded_content() :: + #content{class_id :: amqp_class_id(), + properties :: maybe(amqp_properties()), + properties_bin :: binary(), + payload_fragments_rev :: [binary()]}). -type(content() :: undecoded_content() | decoded_content()). -type(basic_message() :: #basic_message{exchange_name :: exchange_name(), |