diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-27 16:25:13 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-27 16:25:13 +0000 |
| commit | 9a816660975daf6429420290450c1e2fa7cfb191 (patch) | |
| tree | 121c67e14c7cee446b1362c0fc8404c208f6b0a0 /main | |
| parent | 52519dcd93c7772335df9ef01db822c3e0189c06 (diff) | |
Merged revisions 184693 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r184693 | russell | 2009-03-27 11:21:10 -0500 (Fri, 27 Mar 2009) | 2 lines
Change global_app_buf to ast_str_thread_global_buf.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184707 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/app.c | 2 | ||||
| -rw-r--r-- | main/cli.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/app.c b/main/app.c index 5acde1baa..7b79915ea 100644 --- a/main/app.c +++ b/main/app.c @@ -52,7 +52,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/linkedlists.h" #include "asterisk/threadstorage.h" -AST_THREADSTORAGE_PUBLIC(global_app_buf); +AST_THREADSTORAGE_PUBLIC(ast_str_thread_global_buf); #define MAX_OTHER_FORMATS 10 diff --git a/main/cli.c b/main/cli.c index 0bf8151e6..d6ee56adf 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1259,7 +1259,7 @@ static char *handle_showchan(struct ast_cli_entry *e, int cmd, struct ast_cli_ar { struct ast_channel *c=NULL; struct timeval now; - struct ast_str *out = ast_str_thread_get(&global_app_buf, 16); + struct ast_str *out = ast_str_thread_get(&ast_str_thread_global_buf, 16); char cdrtime[256]; char nf[256], wf[256], rf[256]; long elapsed_seconds=0; |