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
This commit is contained in:
parent
7e4c790a3e
commit
993adde868
|
@ -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);
|
||||
|
|
|
@ -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"
|
||||
;;
|
||||
|
|
|
@ -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"
|
||||
;;
|
||||
|
|
Loading…
Reference in New Issue