[svn-commits] russell: branch russell/iax2_find_callno_1.2 r115254 - in /team/russell/iax2_...

[SVN commits to the Digium repositories]

Author: russell
Date: Fri May  2 13:22:35 2008
New Revision: 115254

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115254
Log:
Backport astobj2 ... it compiles, at least

Added:
    team/russell/iax2_find_callno_1.2/astobj2.c
      - copied, changed from r115253, branches/1.4/main/astobj2.c
    team/russell/iax2_find_callno_1.2/include/asterisk/astobj2.h
      - copied unchanged from r115253, branches/1.4/include/asterisk/astobj2.h
Modified:
    team/russell/iax2_find_callno_1.2/Makefile

Modified: team/russell/iax2_find_callno_1.2/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/iax2_find_callno_1.2/Makefile?view=diff&rev=115254&r1=115253&r2=115254
==============================================================================
--- team/russell/iax2_find_callno_1.2/Makefile (original)
+++ team/russell/iax2_find_callno_1.2/Makefile Fri May  2 13:22:35 2008
@@ -354,7 +354,7 @@
 	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
 	utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
 	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
-	cryptostub.o
+	cryptostub.o astobj2.o
 
 ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
   OBJS+= poll.o

Copied: team/russell/iax2_find_callno_1.2/astobj2.c (from r115253, branches/1.4/main/astobj2.c)
URL: http://svn.digium.com/view/asterisk/team/russell/iax2_find_callno_1.2/astobj2.c?view=diff&rev=115254&p1=branches/1.4/main/astobj2.c&r1=115253&p2=team/russell/iax2_find_callno_1.2/astobj2.c&r2=115254
==============================================================================
--- branches/1.4/main/astobj2.c (original)
+++ team/russell/iax2_find_callno_1.2/astobj2.c Fri May  2 13:22:35 2008
@@ -21,9 +21,12 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <stdlib.h>
+
 #include "asterisk/astobj2.h"
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
+#include "asterisk/linkedlists.h"
 
 /*!
  * astobj2 objects are always prepended this data structure,
@@ -212,7 +215,7 @@
 	if (data_size < sizeof(void *))
 		data_size = sizeof(void *);
 
-	obj = ast_calloc(1, sizeof(*obj) + data_size);
+	obj = calloc(1, sizeof(*obj) + data_size);
 
 	if (obj == NULL)
 		return NULL;
@@ -350,7 +353,7 @@
 	if (INTERNAL_OBJ(c) == NULL)
 		return NULL;
 
-	p = ast_calloc(1, sizeof(*p));
+	p = calloc(1, sizeof(*p));
 	if (!p)
 		return NULL;