[Asterisk-cvs] asterisk/res res_features.c,1.16.2.5,1.16.2.6

russell at lists.digium.com russell at lists.digium.com
Tue May 10 23:10:45 CDT 2005


Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv7170/res

Modified Files:
      Tag: v1-0
	res_features.c 
Log Message:
fix compat with astmm (bug #4217)


Index: res_features.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_features.c,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -d -r1.16.2.5 -r1.16.2.6
--- res_features.c	15 Apr 2005 07:15:39 -0000	1.16.2.5
+++ res_features.c	11 May 2005 03:16:52 -0000	1.16.2.6
@@ -38,6 +38,15 @@
 #include <sys/signal.h>
 #include <netinet/in.h>
 
+#ifdef __AST_DEBUG_MALLOC
+static void FREE(void *ptr)
+{
+	free(ptr);
+}
+#else
+#define FREE free
+#endif
+
 #define DEFAULT_PARK_TIME 45000
 #define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000
 
@@ -235,7 +244,7 @@
 			}
 			if (con) {
 				snprintf(exten, sizeof(exten), "%d", x);
-				ast_add_extension2(con, 1, exten, 1, NULL, parkedcall, strdup(exten), free, registrar);
+				ast_add_extension2(con, 1, exten, 1, NULL, parkedcall, strdup(exten), FREE, registrar);
 			}
 			if (pu->notquiteyet) {
 				/* Wake up parking thread if we're really done */
@@ -937,7 +946,7 @@
 			return -1;
 		}
 	}
-	ast_add_extension2(con, 1, ast_parking_ext(), 1, NULL, parkcall, strdup(""),free, registrar);
+	ast_add_extension2(con, 1, ast_parking_ext(), 1, NULL, parkcall, strdup(""), FREE, registrar);
 	ast_pthread_create(&parking_thread, NULL, do_parking_thread, NULL);
 	res = ast_register_application(parkedcall, park_exec, synopsis, descrip);
 	if (!res)




More information about the svn-commits mailing list