diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-14 02:30:33 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-14 02:30:33 +0000 |
commit | 96c9ed94885b0b5c7266d1d1a39f812879ab1548 (patch) | |
tree | 56f6a1edff87d778fc61a175f358aa31189744dd | |
parent | 236826fc1f63b1cd0d484c41e929ac44c2f25ac6 (diff) |
don't double define our own string functions on platforms that don't have them (issue #5169)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6587 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | astmm.c | 1 | ||||
-rwxr-xr-x | include/asterisk/strings.h | 4 | ||||
-rwxr-xr-x | utils.c | 4 |
3 files changed, 4 insertions, 5 deletions
@@ -13,7 +13,6 @@ #ifdef __AST_DEBUG_MALLOC -#include <malloc.h> #include <stdio.h> #include <string.h> #include <time.h> diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h index 37a5faccd..e0e5148a3 100755 --- a/include/asterisk/strings.h +++ b/include/asterisk/strings.h @@ -214,7 +214,7 @@ struct ast_realloca { char *strcasestr(const char *, const char *); #endif -#ifndef HAVE_STRNDUP +#if !defined(HAVE_STRNDUP) && !defined(__AST_DEBUG_MALLOC) char *strndup(const char *, size_t); #endif @@ -222,7 +222,7 @@ char *strndup(const char *, size_t); size_t strnlen(const char *, size_t); #endif -#ifndef HAVE_VASPRINTF +#if !defined(HAVE_VASPRINTF) && !defined(__AST_DEBUG_MALLOC) int vasprintf(char **strp, const char *fmt, va_list ap); #endif @@ -658,7 +658,7 @@ size_t strnlen(const char *s, size_t n) } #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 @@ char *strndup(const char *s, size_t n) } #endif -#ifndef HAVE_VASPRINTF +#if !defined(HAVE_VASPRINTF) && !defined(__AST_DEBUG_MALLOC) int vasprintf(char **strp, const char *fmt, va_list ap) { int size; |