From 988295c6a8ccc6ccf873b11fb7bb44286ffb01b5 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Thu, 13 Jun 2013 21:53:45 +0000 Subject: Make the utils directory compile... again. Utils is a source folder that lies, eventually all developers will cry, "I know I must maintain it, But really with this last commit I can kiss my software ethics good-bye." git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@391732 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- utils/ael_main.c | 5 +++-- utils/check_expr.c | 8 ++++---- utils/conf2ael.c | 4 ++-- utils/refcounter.c | 16 ++++++++-------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/utils/ael_main.c b/utils/ael_main.c index fff28b738..a849e1fdc 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -20,6 +20,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk/backtrace.h" #include "asterisk/channel.h" #include "asterisk/ast_expr.h" #include "asterisk/module.h" @@ -621,12 +622,12 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename, { } -int ast_bt_get_addresses(struct ast_bt *bt) +int __ast_bt_get_addresses(struct ast_bt *bt) { return 0; } -char **ast_bt_get_symbols(void **addresses, size_t num_frames) +char **__ast_bt_get_symbols(void **addresses, size_t num_frames) { char **foo = calloc(num_frames, sizeof(char *) + 1); if (foo) { diff --git a/utils/check_expr.c b/utils/check_expr.c index 556b0f9f8..3ee061d85 100644 --- a/utils/check_expr.c +++ b/utils/check_expr.c @@ -71,14 +71,14 @@ void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt) /* not a lot to do in a standalone w/o threading! */ } -int ast_bt_get_addresses(struct ast_bt *bt); -int ast_bt_get_addresses(struct ast_bt *bt) +int __ast_bt_get_addresses(struct ast_bt *bt); +int __ast_bt_get_addresses(struct ast_bt *bt) { /* Suck it, you stupid utils directory! */ return 0; } -char **ast_bt_get_symbols(void **addresses, size_t num_frames); -char **ast_bt_get_symbols(void **addresses, size_t num_frames) +char **__ast_bt_get_symbols(void **addresses, size_t num_frames); +char **__ast_bt_get_symbols(void **addresses, size_t num_frames) { char **foo = calloc(num_frames, sizeof(char *) + 1); if (foo) { diff --git a/utils/conf2ael.c b/utils/conf2ael.c index f0ac38fad..cec4e4d7f 100644 --- a/utils/conf2ael.c +++ b/utils/conf2ael.c @@ -750,12 +750,12 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename, { } -int ast_bt_get_addresses(struct ast_bt *bt) +int __ast_bt_get_addresses(struct ast_bt *bt) { return 0; } -char **ast_bt_get_symbols(void **addresses, size_t num_frames) +char **__ast_bt_get_symbols(void **addresses, size_t num_frames) { char **foo = calloc(num_frames, sizeof(char *) + 1); if (foo) { diff --git a/utils/refcounter.c b/utils/refcounter.c index b2ad5b0a6..fab906c50 100644 --- a/utils/refcounter.c +++ b/utils/refcounter.c @@ -280,20 +280,20 @@ void ast_unregister_thread(void *id) { } #ifdef HAVE_BKTR -struct ast_bt *ast_bt_create(void); -struct ast_bt *ast_bt_create(void) +struct ast_bt *__ast_bt_create(void); +struct ast_bt *__ast_bt_create(void) { return NULL; } -int ast_bt_get_addresses(struct ast_bt *bt); -int ast_bt_get_addresses(struct ast_bt *bt) +int __ast_bt_get_addresses(struct ast_bt *bt); +int __ast_bt_get_addresses(struct ast_bt *bt) { return 0; } -char **ast_bt_get_symbols(void **addresses, size_t num_frames); -char **ast_bt_get_symbols(void **addresses, size_t num_frames) +char **__ast_bt_get_symbols(void **addresses, size_t num_frames); +char **__ast_bt_get_symbols(void **addresses, size_t num_frames) { char **foo = calloc(num_frames, sizeof(char *) + 1); if (foo) { @@ -305,8 +305,8 @@ char **ast_bt_get_symbols(void **addresses, size_t num_frames) return foo; } -void *ast_bt_destroy(struct ast_bt *bt); -void *ast_bt_destroy(struct ast_bt *bt) +void *__ast_bt_destroy(struct ast_bt *bt); +void *__ast_bt_destroy(struct ast_bt *bt) { return NULL; } -- cgit v1.2.3