summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-05-25 15:45:21 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2011-05-25 15:45:21 +0100
commit3fc13012637011e0565b2eb7e782d209512a5906 (patch)
tree8a1e54b5d61519d949664a55b385a99f072c1d78
parent546a643b30d3ac02221b1dd7ad7d2db66552c113 (diff)
downloadrabbitmq-server-bug24136.tar.gz
R14B03 moved hostname and ip_port out of inet.hrl and into inet.erl where they export_type'd them. This is a backwards incompatible change. Thus there's little alternative to bumping the erts requirement for using specsbug24136
-rw-r--r--Makefile4
-rw-r--r--src/rabbit_networking.erl3
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cdb86aad..e376b4ac 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,8 @@ RABBIT_PLT=rabbit.plt
ifndef USE_SPECS
# our type specs rely on features and bug fixes in dialyzer that are
-# only available in R14A upwards (R14A is erts 5.8)
-USE_SPECS:=$(shell erl -noshell -eval 'io:format([list_to_integer(X) || X <- string:tokens(erlang:system_info(version), ".")] >= [5,8]), halt().')
+# only available in R14B03 upwards (R14B03 is erts 5.8.4)
+USE_SPECS:=$(shell erl -noshell -eval 'io:format([list_to_integer(X) || X <- string:tokens(erlang:system_info(version), ".")] >= [5,8,4]), halt().')
endif
#other args: +native +"{hipe,[o3,verbose]}" -Ddebug=true +debug_info +no_strict_record_tests
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 53be0190..451e56e8 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -43,6 +43,9 @@
-export_type([ip_port/0, hostname/0]).
+-type(hostname() :: inet:hostname()).
+-type(ip_port() :: inet:ip_port()).
+
-type(family() :: atom()).
-type(listener_config() :: ip_port() |
{hostname(), ip_port()} |