[Asterisk-cvs] asterisk astmm.c,1.19,1.20 utils.c,1.67,1.68

[kpfleming]

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

Modified Files:
	astmm.c utils.c 
Log Message:
don't double define our own string functions on platforms that don't have them (issue #5169)


Index: astmm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/astmm.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- astmm.c	23 Aug 2005 15:08:55 -0000	1.19
+++ astmm.c	14 Sep 2005 02:30:33 -0000	1.20
@@ -13,7 +13,6 @@
 
 #ifdef __AST_DEBUG_MALLOC
 
-#include <malloc.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>

Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- utils.c	2 Sep 2005 11:39:24 -0000	1.67
+++ utils.c	14 Sep 2005 02:30:33 -0000	1.68
@@ -658,7 +658,7 @@
 }
 #endif
 
-#ifndef HAVE_STRNDUP
+#if !defined(HAVE_STRNDUP) && !defined(__AST_DEBUG_MALLOC)
 char *strndup(const char *s, size_t n)
 {
 	size_t len = strnlen(s, n);
@@ -672,7 +672,7 @@
 }
 #endif
 
-#ifndef HAVE_VASPRINTF
+#if !defined(HAVE_VASPRINTF) && !defined(__AST_DEBUG_MALLOC)
 int vasprintf(char **strp, const char *fmt, va_list ap)
 {
 	int size;