diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2008-12-09 17:52:10 +0000 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2008-12-09 17:52:10 +0000 |
| commit | d890b2e56d75761d80f6e83e705f22c122a6295d (patch) | |
| tree | 37fc91be7259ffd5599773865fccefe85e37c579 /include | |
| parent | c9e6ec25f539ac69051adb8292d64b92d3110d72 (diff) | |
| parent | db47c2b2979ba25a59c28045ee5abeff2f88648c (diff) | |
| download | rabbitmq-server-git-d890b2e56d75761d80f6e83e705f22c122a6295d.tar.gz | |
merged default into bug18381
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 24 | ||||
| -rw-r--r-- | include/rabbit_framing_spec.hrl | 18 |
2 files changed, 27 insertions, 15 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 267e018b44..d07aeaf845 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -10,13 +10,19 @@ %% %% The Original Code is RabbitMQ. %% -%% The Initial Developers of the Original Code are LShift Ltd., -%% Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +%% The Initial Developers of the Original Code are LShift Ltd, +%% Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. %% -%% Portions created by LShift Ltd., Cohesive Financial Technologies -%% LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008 -%% LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -%% Technologies Ltd.; +%% Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +%% Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +%% 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 +%% Ltd. Portions created by Cohesive Financial Technologies LLC are +%% Copyright (C) 2007-2009 Cohesive Financial Technologies +%% LLC. Portions created by Rabbit Technologies Ltd are Copyright +%% (C) 2007-2009 Rabbit Technologies Ltd. %% %% All Rights Reserved. %% @@ -63,7 +69,7 @@ -include("rabbit_framing_spec.hrl"). -type(maybe(T) :: T | 'none'). --type(node() :: atom()). +-type(erlang_node() :: atom()). -type(socket() :: port()). -type(thunk(T) :: fun(() -> T)). -type(info_key() :: atom()). @@ -125,7 +131,7 @@ -type(msg_id() :: non_neg_integer()). -type(msg() :: {queue_name(), pid(), msg_id(), bool(), message()}). -type(listener() :: - #listener{node :: node(), + #listener{node :: erlang_node(), protocol :: atom(), host :: string() | atom(), port :: non_neg_integer()}). @@ -135,7 +141,7 @@ %%---------------------------------------------------------------------------- --define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2008 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd."). +-define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2009 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd."). -define(INFORMATION_MESSAGE, "Licensed under the MPL. See http://www.rabbitmq.com/"). -ifdef(debug). diff --git a/include/rabbit_framing_spec.hrl b/include/rabbit_framing_spec.hrl index 130001535a..f45fa6caf4 100644 --- a/include/rabbit_framing_spec.hrl +++ b/include/rabbit_framing_spec.hrl @@ -10,13 +10,19 @@ %% %% The Original Code is RabbitMQ. %% -%% The Initial Developers of the Original Code are LShift Ltd., -%% Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd. +%% The Initial Developers of the Original Code are LShift Ltd, +%% Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. %% -%% Portions created by LShift Ltd., Cohesive Financial Technologies -%% LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008 -%% LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit -%% Technologies Ltd.; +%% Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +%% Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +%% 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 +%% Ltd. Portions created by Cohesive Financial Technologies LLC are +%% Copyright (C) 2007-2009 Cohesive Financial Technologies +%% LLC. Portions created by Rabbit Technologies Ltd are Copyright +%% (C) 2007-2009 Rabbit Technologies Ltd. %% %% All Rights Reserved. %% |