diff options
| author | Michael Bridgen <mikeb@lshift.net> | 2010-02-15 13:05:01 +0000 |
|---|---|---|
| committer | Michael Bridgen <mikeb@lshift.net> | 2010-02-15 13:05:01 +0000 |
| commit | 04070fc945b9619e98007b0d574f92fe1e7a8b67 (patch) | |
| tree | eb7539cbec2d8a880e339fd9eda0cb9e3c5fa79e /include/rabbit.hrl | |
| parent | c73b4da7b75f2bec2a81ae26e756780355361134 (diff) | |
| parent | dc574a8ef52dd292084dedfc0692665285f3a7a7 (diff) | |
| download | rabbitmq-server-git-04070fc945b9619e98007b0d574f92fe1e7a8b67.tar.gz | |
De-bitrot by merging default in. Passes rabbit_tests:all_tests() and
the ../rabbitmq-test test suite. Some unused variables appear to have crept
in during previous commits to the branch; will fix in another commit.
Diffstat (limited to 'include/rabbit.hrl')
| -rw-r--r-- | include/rabbit.hrl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 9db497fd28..3baf8c1a67 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -18,11 +18,11 @@ %% are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial %% Technologies LLC, and Rabbit Technologies Ltd. %% -%% Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +%% Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift %% Ltd. Portions created by Cohesive Financial Technologies LLC are -%% Copyright (C) 2007-2009 Cohesive Financial Technologies +%% Copyright (C) 2007-2010 Cohesive Financial Technologies %% LLC. Portions created by Rabbit Technologies Ltd are Copyright -%% (C) 2007-2009 Rabbit Technologies Ltd. +%% (C) 2007-2010 Rabbit Technologies Ltd. %% %% All Rights Reserved. %% @@ -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(), @@ -164,7 +170,7 @@ %%---------------------------------------------------------------------------- --define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd."). +-define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd."). -define(INFORMATION_MESSAGE, "Licensed under the MPL. See http://www.rabbitmq.com/"). -ifdef(debug). |