diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-08-05 03:14:24 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-08-05 03:14:24 +0000 |
| commit | 1765f903c4d270d407508d26a239a501751865fb (patch) | |
| tree | 526334ceed7dcae5e4affed3a6074720fe3ed078 | |
| parent | 224dd669b47617f9197c9be63b5b3ef8c74e2242 (diff) | |
Fix building res_crypto on systems that init locks with constructors.
The problem was that res_crypto now has a RWLIST named "keys". The macro
for defining this list defines a function used as a constructor for the list
called "init_keys". However, there was another function called init_keys in
this module for a CLI command. The fix is just to prepend the generated
functions with underscores.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78138 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | include/asterisk/linkedlists.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h index fdf31c019..257a4688d 100644 --- a/include/asterisk/linkedlists.h +++ b/include/asterisk/linkedlists.h @@ -248,11 +248,11 @@ struct name { \ struct type *last; \ ast_mutex_t lock; \ } name; \ -static void __attribute__ ((constructor)) init_##name(void) \ +static void __attribute__ ((constructor)) __init_##name(void) \ { \ AST_LIST_HEAD_INIT(&name); \ } \ -static void __attribute__ ((destructor)) fini_##name(void) \ +static void __attribute__ ((destructor)) __fini_##name(void) \ { \ AST_LIST_HEAD_DESTROY(&name); \ } \ @@ -290,11 +290,11 @@ struct name { \ struct type *last; \ ast_rwlock_t lock; \ } name; \ -static void __attribute__ ((constructor)) init_##name(void) \ +static void __attribute__ ((constructor)) __init_##name(void) \ { \ AST_RWLIST_HEAD_INIT(&name); \ } \ -static void __attribute__ ((destructor)) fini_##name(void) \ +static void __attribute__ ((destructor)) __fini_##name(void) \ { \ AST_RWLIST_HEAD_DESTROY(&name); \ } \ |