[svn-commits] tilghman: trunk r309036 - in /trunk: ./ include/asterisk/ main/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Feb 28 05:16:08 CST 2011
Author: tilghman
Date: Mon Feb 28 05:16:06 2011
New Revision: 309036
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309036
Log:
Merged revisions 309035 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r309035 | tilghman | 2011-02-28 05:10:28 -0600 (Mon, 28 Feb 2011) | 15 lines
Merged revisions 309033-309034 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r309033 | tilghman | 2011-02-28 04:43:12 -0600 (Mon, 28 Feb 2011) | 4 lines
A later version of flex already includes the fwrite workaround code, which if used twice causes a compilation error.
Detect whether Flex will compile without the workaround; if so, suppress our workaround code.
........
r309034 | tilghman | 2011-02-28 05:07:52 -0600 (Mon, 28 Feb 2011) | 2 lines
Clarify meaning, removing double negative (stupid!)
........
................
Modified:
trunk/ (props changed)
trunk/configure
trunk/configure.ac
trunk/include/asterisk/autoconfig.h.in
trunk/main/ast_expr2.fl
trunk/main/ast_expr2f.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=309036&r1=309035&r2=309036
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Feb 28 05:16:06 2011
@@ -301,6 +301,47 @@
rm -rf ${tmp}
fi
])
+AC_CACHE_CHECK([for flex that ignores fwrite return value], [ac_cv_FLEX_WORKAROUND], [
+ if test "x$FLEX" != "x:" ; then
+ # Create a temporary directory $tmp in $TMPDIR (default /tmp).
+ # Use mktemp if possible; otherwise fall back on mkdir,
+ # with $RANDOM to make collisions less likely.
+ : ${TMPDIR=/tmp}
+ {
+ tmp=`
+ (umask 077 && mktemp -d "$TMPDIR/fooXXXXXX") 2>/dev/null
+ ` &&
+ test -n "$tmp" && test -d "$tmp"
+ } || {
+ tmp=$TMPDIR/foo$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+ } || exit $?
+ cat >$tmp/test.fl <<__EOL__
+%{
+#include <unistd.h>
+#include <stdio.h>
+static void yyunput (int c,char *buf_ptr ) __attribute__((unused));
+static int input(void) __attribute__((unused));
+%}
+
+%%
+username printf( "%s", getlogin() );
+__EOL__
+ ${FLEX} -o ${tmp}/test.c ${tmp}/test.fl
+ ${CC} -o ${tmp}/test.o -c ${tmp}/test.c -Wall -Werror >/dev/null 2>&1
+ if test -e "${tmp}/test.o"; then
+ ac_cv_FLEX_WORKAROUND=no
+ else
+ ac_cv_FLEX_WORKAROUND=yes
+ fi
+ rm -rf ${tmp}
+ fi
+ ])
+
+if test "x${ac_cv_FLEX_WORKAROUND}" = "xyes"; then
+ AC_DEFINE([NEED_FLEX_FWRITE_WORKAROUND], 1, [Define to 1 if your system has a version of flex that does not check the return value of fwrite.])
+fi
+
if test "x${ac_cv_path_BISON2}" = "x" ; then
BISON=:
PBX_BISON=0
Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=309036&r1=309035&r2=309036
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Mon Feb 28 05:16:06 2011
@@ -823,16 +823,16 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `ifr_ifru.ifru_hwaddr' is member of `struct ifreq'. */
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
#undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
-/* Define to 1 if `cr_uid' is member of `struct ucred'. */
+/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_CR_UID
-/* Define to 1 if `uid' is member of `struct ucred'. */
+/* Define to 1 if `uid' is a member of `struct ucred'. */
#undef HAVE_STRUCT_UCRED_UID
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1098,6 +1098,10 @@
/* Build chan_misdn for mISDN 1.2 or later. */
#undef MISDN_1_2
+/* Define to 1 if your system has a version of flex that does not check the
+ return value of fwrite. */
+#undef NEED_FLEX_FWRITE_WORKAROUND
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
@@ -1109,6 +1113,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
Modified: trunk/main/ast_expr2.fl
URL: http://svnview.digium.com/svn/asterisk/trunk/main/ast_expr2.fl?view=diff&rev=309036&r1=309035&r2=309036
==============================================================================
--- trunk/main/ast_expr2.fl (original)
+++ trunk/main/ast_expr2.fl Mon Feb 28 05:16:06 2011
@@ -65,10 +65,12 @@
#include "asterisk/channel.h"
#endif
-/*!\note The latest Flex uses fwrite without checking its return value, which
+#ifdef NEED_FLEX_FWRITE_WORKAROUND
+/*!\note Some versions of Flex use fwrite without checking its return value, which
* is a warning on some compilers. Therefore, we use this workaround, to trick
* the compiler into suppressing this warning. */
#define fwrite(a,b,c,d) do { int __res = fwrite(a,b,c,d); (__res); } while (0)
+#endif
enum valtype {
AST_EXPR_number, AST_EXPR_numeric_string, AST_EXPR_string
Modified: trunk/main/ast_expr2f.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/ast_expr2f.c?view=diff&rev=309036&r1=309035&r2=309036
==============================================================================
--- trunk/main/ast_expr2f.c (original)
+++ trunk/main/ast_expr2f.c Mon Feb 28 05:16:06 2011
@@ -56,7 +56,6 @@
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -86,6 +85,8 @@
#ifndef UINT32_MAX
#define UINT32_MAX (4294967295U)
#endif
+
+#endif /* ! C99 */
#endif /* ! FLEXINT_H */
@@ -160,7 +161,15 @@
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -550,10 +559,12 @@
#include "asterisk/channel.h"
#endif
-/*!\note The latest Flex uses fwrite without checking its return value, which
+#ifdef NEED_FLEX_FWRITE_WORKAROUND
+/*!\note Some versions of Flex use fwrite without checking its return value, which
* is a warning on some compilers. Therefore, we use this workaround, to trick
* the compiler into suppressing this warning. */
#define fwrite(a,b,c,d) do { int __res = fwrite(a,b,c,d); (__res); } while (0)
+#endif
enum valtype {
AST_EXPR_number, AST_EXPR_numeric_string, AST_EXPR_string
@@ -600,7 +611,7 @@
static int curlycount = 0;
static char *expr2_token_subst(const char *mess);
-#line 602 "ast_expr2f.c"
+#line 613 "ast_expr2f.c"
#define INITIAL 0
#define var 1
@@ -739,7 +750,12 @@
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -747,7 +763,7 @@
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -758,7 +774,7 @@
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ size_t n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -843,10 +859,10 @@
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 130 "ast_expr2.fl"
-
-
-#line 848 "ast_expr2f.c"
+#line 132 "ast_expr2.fl"
+
+
+#line 864 "ast_expr2f.c"
yylval = yylval_param;
@@ -937,132 +953,132 @@
case 1:
YY_RULE_SETUP
-#line 132 "ast_expr2.fl"
+#line 134 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_OR;}
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 133 "ast_expr2.fl"
+#line 135 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_AND;}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 134 "ast_expr2.fl"
+#line 136 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_EQ;}
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 135 "ast_expr2.fl"
+#line 137 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_OR;}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 136 "ast_expr2.fl"
+#line 138 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_AND;}
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 137 "ast_expr2.fl"
+#line 139 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_EQ;}
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 138 "ast_expr2.fl"
+#line 140 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_EQTILDE;}
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 139 "ast_expr2.fl"
+#line 141 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_TILDETILDE;}
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 140 "ast_expr2.fl"
+#line 142 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_GT;}
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 141 "ast_expr2.fl"
+#line 143 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_LT;}
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 142 "ast_expr2.fl"
+#line 144 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_GE;}
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 143 "ast_expr2.fl"
+#line 145 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_LE;}
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 144 "ast_expr2.fl"
+#line 146 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_NE;}
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 145 "ast_expr2.fl"
+#line 147 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_PLUS;}
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 146 "ast_expr2.fl"
+#line 148 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COMMA;}
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 147 "ast_expr2.fl"
+#line 149 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_MINUS;}
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 148 "ast_expr2.fl"
+#line 150 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_MULT;}
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 149 "ast_expr2.fl"
+#line 151 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_DIV;}
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 150 "ast_expr2.fl"
+#line 152 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_MOD;}
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 151 "ast_expr2.fl"
+#line 153 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COND;}
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 152 "ast_expr2.fl"
+#line 154 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COMPL;}
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 153 "ast_expr2.fl"
+#line 155 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COLON;}
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 154 "ast_expr2.fl"
+#line 156 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COLONCOLON;}
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 155 "ast_expr2.fl"
+#line 157 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_LP;}
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 156 "ast_expr2.fl"
+#line 158 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_RP;}
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 157 "ast_expr2.fl"
+#line 159 "ast_expr2.fl"
{
/* gather the contents of ${} expressions, with trailing stuff,
* into a single TOKEN.
@@ -1075,24 +1091,24 @@
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 167 "ast_expr2.fl"
+#line 169 "ast_expr2.fl"
{}
YY_BREAK
case 28:
/* rule 28 can match eol */
YY_RULE_SETUP
-#line 168 "ast_expr2.fl"
+#line 170 "ast_expr2.fl"
{SET_COLUMNS; SET_STRING; return TOKEN;}
YY_BREAK
case 29:
/* rule 29 can match eol */
YY_RULE_SETUP
-#line 170 "ast_expr2.fl"
+#line 172 "ast_expr2.fl"
{/* what to do with eol */}
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 171 "ast_expr2.fl"
+#line 173 "ast_expr2.fl"
{
SET_COLUMNS;
/* the original behavior of the expression parser was
@@ -1105,7 +1121,7 @@
case 31:
/* rule 31 can match eol */
YY_RULE_SETUP
-#line 180 "ast_expr2.fl"
+#line 182 "ast_expr2.fl"
{
SET_COLUMNS;
SET_STRING;
@@ -1115,7 +1131,7 @@
case 32:
/* rule 32 can match eol */
YY_RULE_SETUP
-#line 186 "ast_expr2.fl"
+#line 188 "ast_expr2.fl"
{
curlycount = 0;
BEGIN(var);
@@ -1125,7 +1141,7 @@
case 33:
/* rule 33 can match eol */
YY_RULE_SETUP
-#line 192 "ast_expr2.fl"
+#line 194 "ast_expr2.fl"
{
curlycount--;
if (curlycount < 0) {
@@ -1139,7 +1155,7 @@
case 34:
/* rule 34 can match eol */
YY_RULE_SETUP
-#line 202 "ast_expr2.fl"
+#line 204 "ast_expr2.fl"
{
curlycount++;
yymore();
@@ -1147,7 +1163,7 @@
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 208 "ast_expr2.fl"
+#line 210 "ast_expr2.fl"
{
BEGIN(0);
SET_COLUMNS;
@@ -1157,7 +1173,7 @@
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 215 "ast_expr2.fl"
+#line 217 "ast_expr2.fl"
{
curlycount = 0;
BEGIN(var);
@@ -1167,7 +1183,7 @@
case 37:
/* rule 37 can match eol */
YY_RULE_SETUP
-#line 221 "ast_expr2.fl"
+#line 223 "ast_expr2.fl"
{
char c = yytext[yyleng-1];
BEGIN(0);
@@ -1178,7 +1194,7 @@
}
YY_BREAK
case YY_STATE_EOF(trail):
-#line 230 "ast_expr2.fl"
+#line 232 "ast_expr2.fl"
{
BEGIN(0);
SET_COLUMNS;
@@ -1189,10 +1205,10 @@
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 238 "ast_expr2.fl"
+#line 240 "ast_expr2.fl"
ECHO;
YY_BREAK
-#line 1194 "ast_expr2f.c"
+#line 1210 "ast_expr2f.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(var):
yyterminate();
@@ -2128,7 +2144,7 @@
}
/** Set the current column.
- * @param column_no
+ * @param line_number
* @param yyscanner The scanner object.
*/
void ast_yyset_column (int column_no , yyscan_t yyscanner)
@@ -2368,7 +2384,7 @@
#define YYTABLES_NAME "yytables"
-#line 238 "ast_expr2.fl"
+#line 240 "ast_expr2.fl"
More information about the svn-commits
mailing list