automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43421 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 63 insertions, 56 deletions

diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index c8b10e44d..913baaba8 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -897,55 +897,54 @@ static int telem_lookup(struct ast_channel *chan, char *node, char *name)
 
 static int get_wait_interval(struct rpt *myrpt, int type)
 {
-        int interval;
-        char *wait_times;
-        char *wait_times_save;
-                                                                                                                  
-        wait_times_save = NULL;
-        wait_times = ast_variable_retrieve(cfg, myrpt->name, "wait_times");
-                                                                                                                  
-        if(wait_times){
-                wait_times_save = ast_strdupa(wait_times);
-                if(!wait_times_save){
-                        ast_log(LOG_WARNING, "Out of memory in wait_interval()\n");
-                        wait_times = NULL;
-                }
-        }
-                                                                                                                  
-        switch(type){
-                case DLY_TELEM:
-                        if(wait_times)
-                                interval = retrieve_astcfgint(wait_times_save, "telemwait", 500, 5000, 1000);
-                        else
-                                interval = 1000;
-                        break;
-                                                                                                                  
-                case DLY_ID:
-                        if(wait_times)
-                                interval = retrieve_astcfgint(wait_times_save, "idwait",250,5000,500);
-                        else
-                                interval = 500;
-                        break;
-                                                                                                                  
-                case DLY_UNKEY:
-                        if(wait_times)
-                                interval = retrieve_astcfgint(wait_times_save, "unkeywait",500,5000,1000);
-                        else
-                                interval = 1000;
-                        break;
-                                                                                                                  
-                case DLY_CALLTERM:
-                        if(wait_times)
-                                interval = retrieve_astcfgint(wait_times_save, "calltermwait",500,5000,1500);
-                        else
-                                interval = 1500;
-                        break;
-                                                                                                                  
-                default:
-                        return 0;
-        }
+	int interval;
+	char *wait_times;
+	char *wait_times_save = NULL;
+
+	wait_times = ast_variable_retrieve(cfg, myrpt->name, "wait_times");
+
+	if (wait_times) {
+		wait_times_save = ast_strdupa(wait_times);
+		if (!wait_times_save) {
+			ast_log(LOG_WARNING, "Out of memory in wait_interval()\n");
+			wait_times = NULL;
+		}
+	}
+
+	switch (type) {
+	case DLY_TELEM:
+		if (wait_times)
+			interval = retrieve_astcfgint(wait_times_save, "telemwait", 500, 5000, 1000);
+		else
+			interval = 1000;
+		break;
+
+	case DLY_ID:
+		if (wait_times)
+			interval = retrieve_astcfgint(wait_times_save, "idwait", 250, 5000, 500);
+		else
+			interval = 500;
+		break;
+
+	case DLY_UNKEY:
+		if (wait_times)
+			interval = retrieve_astcfgint(wait_times_save, "unkeywait", 500, 5000, 1000);
+		else
+			interval = 1000;
+		break;
+
+	case DLY_CALLTERM:
+		if (wait_times)
+			interval = retrieve_astcfgint(wait_times_save, "calltermwait", 500, 5000, 1500);
+		else
+			interval = 1500;
+		break;
+
+	default:
+		return 0;
+	}
 	return interval;
-}                                                                                                                  
+}														  
 
 
 /*
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);