aboutsummaryrefslogtreecommitdiffstats
path: root/cdr
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-21 17:01:53 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-21 17:01:53 +0000
commitf299b4f1fcacf2953c914dc676b299fc3d27de0a (patch)
tree36cf7b4b9347b4b9135c9d350445abbf10e8247c /cdr
parenta79f85090a4d159b8652d06fc46f5ef24405cae9 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43421 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
-rw-r--r--cdr/Makefile14
-rw-r--r--cdr/cdr_tds.c10
2 files changed, 16 insertions, 8 deletions
diff --git a/cdr/Makefile b/cdr/Makefile
index bca0165c5..6be6d9b95 100644
--- a/cdr/Makefile
+++ b/cdr/Makefile
@@ -46,13 +46,17 @@ endif
# 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),)
- 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_63
+ 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_64
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)
- CFLAGS += -DFREETDS_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.63),1)
+ CFLAGS += -DFREETDS_0_63
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
MODS+=cdr_tds.so
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 14aa9b2bd..66035db08 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);