diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
commit | 0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 (patch) | |
tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /include/asterisk/utils.h | |
parent | f60ada0be22cd646454278e102d384a5dbaf7d59 (diff) |
merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
- support for embedded modules
- support for static builds
- simpler cross-compilation support
- simpler module/loader interface (no exported symbols)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/utils.h')
-rw-r--r-- | include/asterisk/utils.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index ea8b352fb..d037e9991 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -303,7 +303,7 @@ static void ast_free(void *ptr) _ast_malloc((len), __FILE__, __LINE__, __PRETTY_FUNCTION__) AST_INLINE_API( -void * __attribute__((malloc)) _ast_malloc(size_t len, const char *file, int lineno, const char *func), +void * attribute_malloc _ast_malloc(size_t len, const char *file, int lineno, const char *func), { void *p; @@ -328,7 +328,7 @@ void * __attribute__((malloc)) _ast_malloc(size_t len, const char *file, int lin _ast_calloc((num), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__) AST_INLINE_API( -void * __attribute__((malloc)) _ast_calloc(size_t num, size_t len, const char *file, int lineno, const char *func), +void * attribute_malloc _ast_calloc(size_t num, size_t len, const char *file, int lineno, const char *func), { void *p; @@ -353,7 +353,7 @@ void * __attribute__((malloc)) _ast_calloc(size_t num, size_t len, const char *f _ast_realloc((p), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__) AST_INLINE_API( -void * __attribute__((malloc)) _ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func), +void * attribute_malloc _ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func), { void *newp; @@ -382,7 +382,7 @@ void * __attribute__((malloc)) _ast_realloc(void *p, size_t len, const char *fil _ast_strdup((str), __FILE__, __LINE__, __PRETTY_FUNCTION__) AST_INLINE_API( -char * __attribute__((malloc)) _ast_strdup(const char *str, const char *file, int lineno, const char *func), +char * attribute_malloc _ast_strdup(const char *str, const char *file, int lineno, const char *func), { char *newstr = NULL; @@ -413,7 +413,7 @@ char * __attribute__((malloc)) _ast_strdup(const char *str, const char *file, in _ast_strndup((str), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__) AST_INLINE_API( -char * __attribute__((malloc)) _ast_strndup(const char *str, size_t len, const char *file, int lineno, const char *func), +char * attribute_malloc _ast_strndup(const char *str, size_t len, const char *file, int lineno, const char *func), { char *newstr = NULL; |