mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 18:55:19 +00:00 
			
		
		
		
	don't double define our own string functions on platforms that don't have them (issue #5169)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6587 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		
							
								
								
									
										1
									
								
								astmm.c
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								astmm.c
									
									
									
									
									
								
							| @@ -13,7 +13,6 @@ | ||||
|  | ||||
| #ifdef __AST_DEBUG_MALLOC | ||||
|  | ||||
| #include <malloc.h> | ||||
| #include <stdio.h> | ||||
| #include <string.h> | ||||
| #include <time.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 | ||||
|  | ||||
|   | ||||
							
								
								
									
										4
									
								
								utils.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								utils.c
									
									
									
									
									
								
							| @@ -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; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user