Permalink
Browse files

Updated to 2.6.1 and incorporate multiple-inclusion problem fix

  • Loading branch information...
1 parent 1163c0c commit cb4ffed37ffd061ab4550416f1e8ea1147d919a0 @jbrisbin committed Oct 24, 2011
View
@@ -14,6 +14,9 @@
%% Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
%%
+-ifndef(AMQP_CLIENT_HRL).
+-define(AMQP_CLIENT_HRL, true).
+
-include_lib("rabbit_common/include/rabbit.hrl").
-include_lib("rabbit_common/include/rabbit_framing.hrl").
@@ -23,14 +26,17 @@
-define(PROTOCOL, rabbit_framing_amqp_0_9_1).
-define(MAX_CHANNEL_NUMBER, 65535).
+-define(DEFAULT_CONSUMER, {amqp_selective_consumer, []}).
+
+-define(PROTOCOL_SSL_PORT, (?PROTOCOL_PORT - 1)).
-record(amqp_msg, {props = #'P_basic'{}, payload = <<>>}).
-record(amqp_params_network, {username = <<"guest">>,
password = <<"guest">>,
virtual_host = <<"/">>,
host = "localhost",
- port = ?PROTOCOL_PORT,
+ port = undefined,
channel_max = 0,
frame_max = 0,
heartbeat = 0,
@@ -57,7 +63,10 @@
-define(LOG_DEBUG(Format), error_logger:info_msg(Format)).
-define(LOG_INFO(Format, Args), error_logger:info_msg(Format, Args)).
-define(LOG_WARN(Format, Args), error_logger:warning_msg(Format, Args)).
+
-define(CLIENT_CAPABILITIES, [{<<"publisher_confirms">>, bool, true},
{<<"exchange_exchange_bindings">>, bool, true},
{<<"basic.nack">>, bool, true},
{<<"consumer_cancel_notify">>, bool, true}]).
+
+-endif.
@@ -14,6 +14,7 @@
%% Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
%%
+%% @private
-module(amqp_auth_mechanisms).
-include("amqp_client.hrl").
Oops, something went wrong.

0 comments on commit cb4ffed

Please sign in to comment.