kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

TDS 0.64 updates

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@43409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-09-21 16:18:19 +00:00
parent 377dac8495
commit a6751ecf3a
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cdr/Makefile
View File

@@ -46,13 +46,17 @@ endif
# FreeTDS stuff... # FreeTDS stuff...
# #
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),) ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1)
CFLAGS += -DFREETDS_0_63 CFLAGS += -DFREETDS_0_64
else else
ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
CFLAGS += -DFREETDS_0_62 CFLAGS += -DFREETDS_0_63
else else
CFLAGS += -DFREETDS_PRE_0_62 ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
CFLAGS += -DFREETDS_0_62
else
CFLAGS += -DFREETDS_PRE_0_62
endif
endif endif
endif endif
MODS+=cdr_tds.so MODS+=cdr_tds.so

10
cdr/cdr_tds.c
View File

@@ -320,7 +320,7 @@ static int mssql_disconnect(void)
static int mssql_connect(void) static int mssql_connect(void)
{ {
#ifdef FREETDS_0_63 #if (defined(FREETDS_0_63) || defined(FREETDS_0_64))
TDSCONNECTION *connection = NULL; TDSCONNECTION *connection = NULL;
#else #else
TDSCONNECTINFO *connection = NULL; TDSCONNECTINFO *connection = NULL;
@@ -346,7 +346,11 @@ static int mssql_connect(void)
tds_set_packet(login, 512); tds_set_packet(login, 512);
tds_set_version(login, 7, 0); tds_set_version(login, 7, 0);
#ifdef FREETDS_0_64
if (!(context = tds_alloc_context(NULL)))
#else
if (!(context = tds_alloc_context())) if (!(context = tds_alloc_context()))
#endif
{ {
ast_log(LOG_ERROR, "tds_alloc_context() failed.\n"); ast_log(LOG_ERROR, "tds_alloc_context() failed.\n");
goto connect_fail; goto connect_fail;
@@ -369,7 +373,7 @@ static int mssql_connect(void)
{ {
ast_log(LOG_ERROR, "Failed to connect to MSSQL server.\n"); ast_log(LOG_ERROR, "Failed to connect to MSSQL server.\n");
tds = NULL; /* freed by tds_connect() on error */ 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); tds_free_connection(connection);
#else #else
tds_free_connect(connection); tds_free_connect(connection);
@@ -377,7 +381,7 @@ static int mssql_connect(void)
connection = NULL; connection = NULL;
goto connect_fail; goto connect_fail;
} }
#ifdef FREETDS_0_63 #if (defined(FREETDS_0_63) || defined(FREETDS_0_64))
tds_free_connection(connection); tds_free_connection(connection);
#else #else
tds_free_connect(connection); tds_free_connect(connection);