Module Name: src
Committed By: christos
Date: Wed Oct 28 22:00:56 UTC 2009
Modified Files:
src/external/bsd/flex/dist: flex.skl initscan.c
Log Message:
prefix some parameters with _ to avoid conflicts with files that have the
same variable names as globals.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/flex.skl
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/initscan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/dist/flex.skl
diff -u src/external/bsd/flex/dist/flex.skl:1.3 src/external/bsd/flex/dist/flex.skl:1.4
--- src/external/bsd/flex/dist/flex.skl:1.3 Wed Oct 28 01:04:02 2009
+++ src/external/bsd/flex/dist/flex.skl Wed Oct 28 18:00:56 2009
@@ -932,7 +932,7 @@
m4_ifdef( [[M4_YY_NO_SET_IN]],,
[[
-void yyset_in M4_YY_PARAMS( FILE * in_str M4_YY_PROTO_LAST_ARG );
+void yyset_in M4_YY_PARAMS( FILE * _in_str M4_YY_PROTO_LAST_ARG );
]])
m4_ifdef( [[M4_YY_NO_GET_OUT]],,
@@ -942,7 +942,7 @@
m4_ifdef( [[M4_YY_NO_SET_OUT]],,
[[
-void yyset_out M4_YY_PARAMS( FILE * out_str M4_YY_PROTO_LAST_ARG );
+void yyset_out M4_YY_PARAMS( FILE * _out_str M4_YY_PROTO_LAST_ARG );
]])
m4_ifdef( [[M4_YY_NO_GET_LENG]],,
@@ -962,7 +962,7 @@
m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
[[
-void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
+void yyset_lineno M4_YY_PARAMS( int _line_number M4_YY_PROTO_LAST_ARG );
]])
%if-bison-bridge
@@ -1049,7 +1049,7 @@
[[
m4_ifdef( [[M4_YY_NO_PUSH_STATE]],,
[[
- static void yy_push_state M4_YY_PARAMS( int new_state M4_YY_PROTO_LAST_ARG);
+ static void yy_push_state M4_YY_PARAMS( int _new_state M4_YY_PROTO_LAST_ARG);
]])
m4_ifdef( [[M4_YY_NO_POP_STATE]],,
[[
@@ -2400,10 +2400,10 @@
m4_ifdef( [[M4_YY_NO_PUSH_STATE]],,
[[
%if-c-only
- static void yy_push_state YYFARGS1( int ,new_state)
+ static void yy_push_state YYFARGS1( int ,_new_state)
%endif
%if-c++-only
- void yyFlexLexer::yy_push_state( int new_state )
+ void yyFlexLexer::yy_push_state( int _new_state )
%endif
{
M4_YY_DECL_GUTS_VAR();
@@ -2427,7 +2427,7 @@
YY_G(yy_start_stack)[YY_G(yy_start_stack_ptr)++] = YY_START;
- BEGIN(new_state);
+ BEGIN(_new_state);
}
]])
@@ -2626,10 +2626,10 @@
m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
[[
/** Set the current line number.
- * @param line_number
+ * @param _line_number
* M4_YY_DOC_PARAM
*/
-void yyset_lineno YYFARGS1( int ,line_number)
+void yyset_lineno YYFARGS1( int ,_line_number)
{
M4_YY_DECL_GUTS_VAR();
@@ -2639,7 +2639,7 @@
if (! YY_CURRENT_BUFFER )
yy_fatal_error( "yyset_lineno called with no buffer" M4_YY_CALL_LAST_ARG);
]])
- yylineno = line_number;
+ yylineno = _line_number;
}
]])
@@ -2648,10 +2648,10 @@
m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
[[
/** Set the current column.
- * @param line_number
+ * @param _line_number
* M4_YY_DOC_PARAM
*/
-void yyset_column YYFARGS1( int , column_no)
+void yyset_column YYFARGS1( int , _column_no)
{
M4_YY_DECL_GUTS_VAR();
@@ -2661,7 +2661,7 @@
if (! YY_CURRENT_BUFFER )
yy_fatal_error( "yyset_column called with no buffer" M4_YY_CALL_LAST_ARG);
]])
- yycolumn = column_no;
+ yycolumn = _column_no;
}
]])
]])
@@ -2671,23 +2671,23 @@
[[
/** Set the input stream. This does not discard the current
* input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
* M4_YY_DOC_PARAM
* @see yy_switch_to_buffer
*/
-void yyset_in YYFARGS1( FILE * ,in_str)
+void yyset_in YYFARGS1( FILE * ,_in_str)
{
M4_YY_DECL_GUTS_VAR();
- yyin = in_str ;
+ yyin = _in_str ;
}
]])
m4_ifdef( [[M4_YY_NO_SET_OUT]],,
[[
-void yyset_out YYFARGS1( FILE * ,out_str)
+void yyset_out YYFARGS1( FILE * ,_out_str)
{
M4_YY_DECL_GUTS_VAR();
- yyout = out_str ;
+ yyout = _out_str ;
}
]])
@@ -2703,10 +2703,10 @@
m4_ifdef( [[M4_YY_NO_SET_DEBUG]],,
[[
-void yyset_debug YYFARGS1( int ,bdebug)
+void yyset_debug YYFARGS1( int ,_bdebug)
{
M4_YY_DECL_GUTS_VAR();
- yy_flex_debug = bdebug ;
+ yy_flex_debug = _bdebug ;
}
]])
%endif
Index: src/external/bsd/flex/dist/initscan.c
diff -u src/external/bsd/flex/dist/initscan.c:1.2 src/external/bsd/flex/dist/initscan.c:1.3
--- src/external/bsd/flex/dist/initscan.c:1.2 Wed Oct 28 01:04:02 2009
+++ src/external/bsd/flex/dist/initscan.c Wed Oct 28 18:00:56 2009
@@ -2032,11 +2032,11 @@
FILE *yyget_in (void );
-void yyset_in (FILE * in_str );
+void yyset_in (FILE * _in_str );
FILE *yyget_out (void );
-void yyset_out (FILE * out_str );
+void yyset_out (FILE * _out_str );
int yyget_leng (void );
@@ -2044,7 +2044,7 @@
int yyget_lineno (void );
-void yyset_lineno (int line_number );
+void yyset_lineno (int _line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -2082,7 +2082,7 @@
static int yy_start_stack_depth = 0;
static int *yy_start_stack = NULL;
- static void yy_push_state (int new_state );
+ static void yy_push_state (int _new_state );
static void yy_pop_state (void );
@@ -4885,7 +4885,7 @@
return b;
}
- static void yy_push_state (int new_state )
+ static void yy_push_state (int _new_state )
{
if ( (yy_start_stack_ptr) >= (yy_start_stack_depth) )
{
@@ -4906,7 +4906,7 @@
(yy_start_stack)[(yy_start_stack_ptr)++] = YY_START;
- BEGIN(new_state);
+ BEGIN(_new_state);
}
static void yy_pop_state (void)
@@ -4989,29 +4989,29 @@
}
/** Set the current line number.
- * @param line_number
+ * @param _line_number
*
*/
-void yyset_lineno (int line_number )
+void yyset_lineno (int _line_number )
{
- yylineno = line_number;
+ yylineno = _line_number;
}
/** Set the input stream. This does not discard the current
* input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
*
* @see yy_switch_to_buffer
*/
-void yyset_in (FILE * in_str )
+void yyset_in (FILE * _in_str )
{
- yyin = in_str ;
+ yyin = _in_str ;
}
-void yyset_out (FILE * out_str )
+void yyset_out (FILE * _out_str )
{
- yyout = out_str ;
+ yyout = _out_str ;
}
int yyget_debug (void)
@@ -5019,9 +5019,9 @@
return yy_flex_debug;
}
-void yyset_debug (int bdebug )
+void yyset_debug (int _bdebug )
{
- yy_flex_debug = bdebug ;
+ yy_flex_debug = _bdebug ;
}
static int yy_init_globals (void)
