summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-02-23 13:50:38 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2011-02-23 13:50:38 +0000
commit0b06530a5532549f7de8d57d624fac546961fb97 (patch)
tree827493c951daf439e9cea382fa7c85ff4e01cf22 /include
parent32d11d570edcf1ae20ef5806e23edca47ae00ad6 (diff)
parent245592bc7051cfcb16cfd0dff84085d1294e8146 (diff)
downloadrabbitmq-server-git-0b06530a5532549f7de8d57d624fac546961fb97.tar.gz
Merging bug23727 to bug23554
Diffstat (limited to 'include')
-rw-r--r--include/gm_specs.hrl2
-rw-r--r--include/rabbit.hrl2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gm_specs.hrl b/include/gm_specs.hrl
index 2109d15d22..ee29706e98 100644
--- a/include/gm_specs.hrl
+++ b/include/gm_specs.hrl
@@ -17,7 +17,7 @@
-ifdef(use_specs).
-type(callback_result() :: 'ok' | {'stop', any()} | {'become', atom(), args()}).
--type(args() :: [any()]).
+-type(args() :: any()).
-type(members() :: [pid()]).
-spec(joined/2 :: (args(), members()) -> callback_result()).
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index f79a8106b0..327867c75e 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -28,7 +28,7 @@
-record(vhost, {virtual_host, dummy}).
-record(connection, {protocol, user, timeout_sec, frame_max, vhost,
- client_properties}).
+ client_properties, capabilities}).
-record(content,
{class_id,