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

........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43411 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 9ca5c2f32eebef058610e0e0aa2fdc55e2223eca..2ac8481a825483a0684f8fcda102eb94b57f66f2 100644 (file)
--- 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);

diff --git a/configure b/configure
index 188c4113ae2a779ed1bdd40406881da03c19cf11..547eb623f0827e42fa8366a9492fe51fc2a84da8 100755 (executable)
--- a/configure
+++ b/configure
@@ -27526,6 +27526,9 @@ fi
 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"
        ;;

diff --git a/configure.ac b/configure.ac
index 167a402be75812b2151ead25b28a299b1531f136..3218814fef2bf4aee97eb2945ae98f91f5eb00d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -837,6 +837,9 @@ AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h])
 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"
        ;;