summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert@lshift.net>2008-09-15 10:37:53 +0100
committerHubert Plociniczak <hubert@lshift.net>2008-09-15 10:37:53 +0100
commit309cb71c78d84d09d970a5f0081b6f13891a1b59 (patch)
treee752383484f2691b920acedddc050c44893d8951 /include
parent5c400123df5ca4c472fb80a5e739ba525a23e6c7 (diff)
parent54032ca82e19b0c27b5f4257fb5cfd3b44636510 (diff)
downloadrabbitmq-server-git-309cb71c78d84d09d970a5f0081b6f13891a1b59.tar.gz
merge default into bug19332
Diffstat (limited to 'include')
-rw-r--r--include/rabbit.hrl2
-rw-r--r--include/rabbit_framing_spec.hrl2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index cc8fb1b526..180a0dc392 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -71,7 +71,7 @@
-type(r(Kind) ::
#resource{virtual_host :: vhost(),
kind :: Kind,
- name :: name()}).
+ name :: resource_name()}).
-type(queue_name() :: r('queue')).
-type(exchange_name() :: r('exchange')).
-type(user() ::
diff --git a/include/rabbit_framing_spec.hrl b/include/rabbit_framing_spec.hrl
index ef9ab58487..e9e650929b 100644
--- a/include/rabbit_framing_spec.hrl
+++ b/include/rabbit_framing_spec.hrl
@@ -46,7 +46,7 @@
-type(channel_number() :: non_neg_integer()).
%% TODO: make this more precise
-type(amqp_error() :: {bool(), non_neg_integer(), binary()}).
--type(name() :: binary()).
+-type(resource_name() :: binary()).
-type(routing_key() :: binary()).
-type(username() :: binary()).
-type(password() :: binary()).