diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-21 14:40:10 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-21 14:40:10 +0000 |
| commit | 16927b7f7a7bce25329d1c2be0f31fbd789cb221 (patch) | |
| tree | 9799cdd844ef78877a6446a6746e82e0c090bc9a /main/ast_expr2f.c | |
| parent | e935ee6eac3ecb38b704ea2e9c2e86309150ab84 (diff) | |
Merged revisions 83432 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83432 | russell | 2007-09-21 09:37:20 -0500 (Fri, 21 Sep 2007) | 4 lines
gcc 4.2 has a new set of warnings dealing with cosnt pointers. This set of
changes gets all of Asterisk (minus chan_alsa for now) to compile with gcc 4.2.
(closes issue #10774, patch from qwell)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@83433 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/ast_expr2f.c')
| -rw-r--r-- | main/ast_expr2f.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c index 860f19f2d..7310e0196 100644 --- a/main/ast_expr2f.c +++ b/main/ast_expr2f.c @@ -1482,7 +1482,7 @@ struct parse_io void ast_yyset_column(int column_no, yyscan_t yyscanner); int ast_yyget_column(yyscan_t yyscanner); static int curlycount = 0; -static char *expr2_token_subst(char *mess); +static char *expr2_token_subst(const char *mess); #line 1488 "ast_expr2f.c" @@ -3310,11 +3310,11 @@ static char *expr2_token_equivs2[] = }; -static char *expr2_token_subst(char *mess) +static char *expr2_token_subst(const char *mess) { /* calc a length, malloc, fill, and return; yyerror had better free it! */ int len=0,i; - char *p; + const char *p; char *res, *s,*t; int expr2_token_equivs_entries = sizeof(expr2_token_equivs1)/sizeof(char*); @@ -3359,7 +3359,7 @@ int ast_yyerror (const char *s, yyltype *loc, struct parse_io *parseio ) char spacebuf[8000]; /* best safe than sorry */ char spacebuf2[8000]; /* best safe than sorry */ int i=0; - char *s2 = expr2_token_subst((char *)s); + char *s2 = expr2_token_subst(s); spacebuf[0] = 0; for(i=0;i< (int)(yytext - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);i++) spacebuf2[i] = ' '; /* uh... assuming yyg is defined, then I can use the yycolumn macro, |