[asterisk-commits] tilghman: trunk r43411 - in /trunk: ./ cdr/cdr_tds.c configure configure.ac

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Thu Sep 21 11:38:16 2006
New Revision: 43411

URL: http://svn.digium.com/view/asterisk?rev=43411&view=rev
Log:
Merged revisions 43410 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r43410 | tilghman | 2006-09-21 11:31:59 -0500 (Thu, 21 Sep 2006) | 10 lines

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

........

................

Modified:
    trunk/   (props changed)
    trunk/cdr/cdr_tds.c
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Sep 21 11:38:16 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405
+/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410

Modified: trunk/cdr/cdr_tds.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_tds.c?rev=43411&r1=43410&r2=43411&view=diff
==============================================================================
--- trunk/cdr/cdr_tds.c (original)
+++ trunk/cdr/cdr_tds.c Thu Sep 21 11:38:16 2006
@@ -320,7 +320,7 @@
 
 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 @@
 	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 @@
 	{
 		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 @@
 		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);

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=43411&r1=43410&r2=43411&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Sep 21 11:38:16 2006
@@ -27526,6 +27526,9 @@
 if test "${PBX_FREETDS}" != "0";
 then
     case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr/include}/tdsver.h` in
+	*0.64*)
+		FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64"
+	;;
     *0.63*)
         FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63"
 	;;

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=43411&r1=43410&r2=43411&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Sep 21 11:38:16 2006
@@ -837,6 +837,9 @@
 if test "${PBX_FREETDS}" != "0";
 then
     case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr/include}/tdsver.h` in
+	*0.64*)
+		FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64"
+	;;
     *0.63*)
         FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63"
 	;;