From d7d2a99021c740cbf8d7cb40127cdc8aef099f90 Mon Sep 17 00:00:00 2001 From: tilghman Date: Thu, 21 Sep 2006 16:31:59 +0000 Subject: Merged revisions 43409 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r43409 | tilghman | 2006-09-21 11:18:19 -0500 (Thu, 21 Sep 2006) | 2 lines TDS 0.64 updates ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@43410 f38db490-d61c-443f-a65b-d21fe96a405b --- cdr/cdr_tds.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'cdr/cdr_tds.c') diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index 9ca5c2f32..2ac8481a8 100644 --- a/cdr/cdr_tds.c +++ b/cdr/cdr_tds.c @@ -320,7 +320,7 @@ static int mssql_disconnect(void) static int mssql_connect(void) { -#ifdef FREETDS_0_63 +#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) TDSCONNECTION *connection = NULL; #else TDSCONNECTINFO *connection = NULL; @@ -346,7 +346,11 @@ static int mssql_connect(void) tds_set_packet(login, 512); tds_set_version(login, 7, 0); +#ifdef FREETDS_0_64 + if (!(context = tds_alloc_context(NULL))) +#else if (!(context = tds_alloc_context())) +#endif { ast_log(LOG_ERROR, "tds_alloc_context() failed.\n"); goto connect_fail; @@ -369,7 +373,7 @@ static int mssql_connect(void) { ast_log(LOG_ERROR, "Failed to connect to MSSQL server.\n"); tds = NULL; /* freed by tds_connect() on error */ -#ifdef FREETDS_0_63 +#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) tds_free_connection(connection); #else tds_free_connect(connection); @@ -377,7 +381,7 @@ static int mssql_connect(void) connection = NULL; goto connect_fail; } -#ifdef FREETDS_0_63 +#if (defined(FREETDS_0_63) || defined(FREETDS_0_64)) tds_free_connection(connection); #else tds_free_connect(connection); -- cgit v1.2.3