summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-10-30 08:12:56 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2012-10-30 08:12:56 +0000
commit1c7557a22d5b354c4c2e8a2268536511d020e689 (patch)
treebaf7588bc58610cacb9d96c930b8d7ed4723f22f
parente2a63a01e779bc8ef7c326ad04d4d4aaa7b23e6c (diff)
downloadrabbitmq-server-git-1c7557a22d5b354c4c2e8a2268536511d020e689.tar.gz
fix R12B-3 build breakage
looks like one cannot define two macros with the same name but different arity
-rw-r--r--src/rabbit_tests.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 51ca6043b4..eb97f1d6ff 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -178,7 +178,7 @@ test_rabbit_basic_header_handling() ->
-define(ROUTE_TABLE, [{<<"redelivered">>, bool, <<"true">>}]).
-define(BAD_HEADER(K), {<<K>>, longstr, <<"bad ", K>>}).
--define(BAD_HEADER(K, Suf), {<<K>>, longstr, <<"bad ", K, Suf>>}).
+-define(BAD_HEADER2(K, Suf), {<<K>>, longstr, <<"bad ", K, Suf>>}).
-define(FOUND_BAD_HEADER(K), {<<K>>, array, [{longstr, <<"bad ", K>>}]}).
write_table_with_invalid_existing_type_test() ->
@@ -212,10 +212,10 @@ corrupt_or_invalid_headers_are_overwritten_test() ->
passed.
invalid_same_header_entry_accumulation_test() ->
- BadHeader1 = ?BAD_HEADER("header1", "a"),
+ BadHeader1 = ?BAD_HEADER2("header1", "a"),
Headers = prepend_check(<<"header1">>, ?ROUTE_TABLE, [BadHeader1]),
Headers2 = prepend_check(<<"header1">>, ?ROUTE_TABLE,
- [?BAD_HEADER("header1", "b") | Headers]),
+ [?BAD_HEADER2("header1", "b") | Headers]),
{table, InvalidHeaders} =
rabbit_misc:table_lookup(Headers2, ?INVALID_HEADERS_KEY),
{array, [{longstr,<<"bad header1b">>},