Module Name: src
Committed By: christos
Date: Sat Apr 6 14:27:53 UTC 2013
Modified Files:
src/external/bsd/flex/dist: buf.c filter.c flex.skl flexdef.h gen.c
main.c misc.c parse.y scan.l scanopt.c tables.c
src/external/bsd/flex/include: config.h
Removed Files:
src/external/bsd/flex/dist/m4: Makefile.am Makefile.in codeset.m4
glibc21.m4 intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4
isc-posix.m4 lcmessage.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
src/external/bsd/flex/dist/tools: cvs2cl.pl cvsauthors
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/flex/dist/buf.c \
src/external/bsd/flex/dist/filter.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/flex/dist/flex.skl
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/flexdef.h \
src/external/bsd/flex/dist/misc.c src/external/bsd/flex/dist/parse.y \
src/external/bsd/flex/dist/scanopt.c src/external/bsd/flex/dist/tables.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/gen.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/main.c \
src/external/bsd/flex/dist/scan.l
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/m4/Makefile.am \
src/external/bsd/flex/dist/m4/Makefile.in \
src/external/bsd/flex/dist/m4/codeset.m4 \
src/external/bsd/flex/dist/m4/glibc21.m4 \
src/external/bsd/flex/dist/m4/intdiv0.m4 \
src/external/bsd/flex/dist/m4/inttypes-pri.m4 \
src/external/bsd/flex/dist/m4/inttypes.m4 \
src/external/bsd/flex/dist/m4/inttypes_h.m4 \
src/external/bsd/flex/dist/m4/isc-posix.m4 \
src/external/bsd/flex/dist/m4/lcmessage.m4 \
src/external/bsd/flex/dist/m4/stdint_h.m4 \
src/external/bsd/flex/dist/m4/uintmax_t.m4 \
src/external/bsd/flex/dist/m4/ulonglong.m4
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/tools/cvs2cl.pl \
src/external/bsd/flex/dist/tools/cvsauthors
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/include/config.h
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/buf.c
diff -u src/external/bsd/flex/dist/buf.c:1.1.1.2 src/external/bsd/flex/dist/buf.c:1.2
--- src/external/bsd/flex/dist/buf.c:1.1.1.2 Sat Apr 6 10:05:39 2013
+++ src/external/bsd/flex/dist/buf.c Sat Apr 6 10:27:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.1.1.2 2013/04/06 14:05:39 christos Exp $ */
+/* $NetBSD: buf.c,v 1.2 2013/04/06 14:27:52 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -92,7 +92,8 @@ struct Buf *buf_prints (struct Buf *buf,
*/
struct Buf *buf_linedir (struct Buf *buf, const char* filename, int lineno)
{
- char *dst, *src, *t;
+ char *dst, *t;
+ const char *src;
t = flex_alloc (strlen ("#line \"\"\n") + /* constant parts */
2 * strlen (filename) + /* filename with possibly all backslashes escaped */
Index: src/external/bsd/flex/dist/filter.c
diff -u src/external/bsd/flex/dist/filter.c:1.1.1.2 src/external/bsd/flex/dist/filter.c:1.2
--- src/external/bsd/flex/dist/filter.c:1.1.1.2 Sat Apr 6 10:05:42 2013
+++ src/external/bsd/flex/dist/filter.c Sat Apr 6 10:27:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: filter.c,v 1.1.1.2 2013/04/06 14:05:42 christos Exp $ */
+/* $NetBSD: filter.c,v 1.2 2013/04/06 14:27:52 christos Exp $ */
/* filter - postprocessing of flex output through filters */
@@ -137,9 +137,6 @@ struct filter *filter_create_int (struct
bool filter_apply_chain (struct filter * chain)
{
int pid, pipes[2];
- int r;
- const int readsz = 512;
- char *buf;
/* Tricky recursion, since we want to begin the chain
Index: src/external/bsd/flex/dist/flex.skl
diff -u src/external/bsd/flex/dist/flex.skl:1.7 src/external/bsd/flex/dist/flex.skl:1.8
--- src/external/bsd/flex/dist/flex.skl:1.7 Mon Dec 26 12:32:28 2011
+++ src/external/bsd/flex/dist/flex.skl Sat Apr 6 10:27:52 2013
@@ -224,6 +224,7 @@ m4preproc_include(`flexint.h')
#include <iostream>
#include <errno.h>
#include <cstdlib>
+#include <cstdio>
#include <cstring>
/* end standard C++ headers. */
%endif
@@ -294,6 +295,8 @@ typedef void* yyscan_t;
%# Declare yyguts variable
m4_define( [[M4_YY_DECL_GUTS_VAR]], [[struct yyguts_t * yyg = (struct yyguts_t*)yyscanner]])
+%# Perform a noop access on yyguts to prevent unused variable complains
+m4_define( [[M4_YY_NOOP_GUTS_VAR]], [[(void)yyg]])
%# For use wherever a Global is accessed or assigned.
m4_define( [[YY_G]], [[yyg->$1]])
@@ -351,6 +354,7 @@ m4_define( [[M4_YY_INCR_LINENO]],
%# Define these macros to be no-ops.
m4_define( [[M4_YY_DECL_GUTS_VAR]], [[m4_dnl]])
+m4_define( [[M4_YY_NOOP_GUTS_VAR]], [[m4_dnl]])
m4_define( [[YY_G]], [[($1)]])
m4_define( [[M4_YY_PROTO_LAST_ARG]])
m4_define( [[M4_YY_PROTO_ONLY_ARG]], [[void]])
@@ -465,8 +469,13 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
%if-not-reentrant
-extern int yyleng;
+extern yy_size_t yyleng;
%endif
%if-c-only
@@ -528,11 +537,6 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
#define unput(c) yyunput( c, YY_G(yytext_ptr) M4_YY_CALL_LAST_ARG )
]])
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@@ -557,7 +561,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -646,8 +650,8 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
%not-for-header
/* yy_hold_char holds the character lost when yytext is formed. */
static char yy_hold_char;
-static int yy_n_chars; /* number of characters read into yy_ch_buf */
-int yyleng;
+static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
+yy_size_t yyleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
@@ -683,7 +687,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
YY_BUFFER_STATE yy_scan_buffer M4_YY_PARAMS( char *base, yy_size_t size M4_YY_PROTO_LAST_ARG );
YY_BUFFER_STATE yy_scan_string M4_YY_PARAMS( yyconst char *yy_str M4_YY_PROTO_LAST_ARG );
-YY_BUFFER_STATE yy_scan_bytes M4_YY_PARAMS( yyconst char *bytes, int len M4_YY_PROTO_LAST_ARG );
+YY_BUFFER_STATE yy_scan_bytes M4_YY_PARAMS( yyconst char *bytes, yy_size_t len M4_YY_PROTO_LAST_ARG );
%endif
@@ -812,8 +816,8 @@ struct yyguts_t
size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char;
- int yy_n_chars;
- int yyleng_r;
+ yy_size_t yy_n_chars;
+ yy_size_t yyleng_r;
char *yy_c_buf_p;
int yy_init;
int yy_start;
@@ -950,7 +954,7 @@ void yyset_out M4_YY_PARAMS( FILE * _ou
m4_ifdef( [[M4_YY_NO_GET_LENG]],,
[[
-int yyget_leng M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
+yy_size_t yyget_leng M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
]])
m4_ifdef( [[M4_YY_NO_GET_TEXT]],,
@@ -968,6 +972,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
void yyset_lineno M4_YY_PARAMS( int _line_number M4_YY_PROTO_LAST_ARG );
]])
+m4_ifdef( [[M4_YY_REENTRANT]],
+[[
+m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,
+[[
+int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
+]])
+]])
+
+m4_ifdef( [[M4_YY_REENTRANT]],
+[[
+m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
+[[
+void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );
+]])
+]])
+
%if-bison-bridge
m4_ifdef( [[M4_YY_NO_GET_LVAL]],,
[[
@@ -1085,7 +1105,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
/* 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
%if-c++-only C++ definition
#define ECHO LexerOutput( yytext, yyleng )
@@ -1640,7 +1660,7 @@ int yyFlexLexer::yy_get_next_buffer()
else
{
- int num_to_read =
+ yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -1652,14 +1672,14 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
]],
[[
/* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
int yy_c_buf_p_offset =
(int) (YY_G(yy_c_buf_p) - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
- int new_size = b->yy_buf_size * 2;
+ yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1691,7 +1711,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- YY_G(yy_n_chars), (size_t) num_to_read );
+ YY_G(yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = YY_G(yy_n_chars);
}
@@ -1775,6 +1795,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
M4_YY_DECL_GUTS_VAR(); /* This var may be unused depending upon options. */
%% [17.0] code to find the next state, and perhaps do backing up, goes here
+ M4_YY_NOOP_GUTS_VAR();
return yy_is_jam ? 0 : yy_current_state;
}
@@ -1800,7 +1821,7 @@ m4_ifdef( [[M4_YY_NO_UNPUT]],,
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
- register int number_to_move = YY_G(yy_n_chars) + 2;
+ register yy_size_t number_to_move = YY_G(yy_n_chars) + 2;
register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
register char *source =
@@ -1867,7 +1888,7 @@ m4_ifdef( [[M4_YY_USE_LINENO]],
else
{ /* need more input */
- int offset = YY_G(yy_c_buf_p) - YY_G(yytext_ptr);
+ yy_size_t offset = YY_G(yy_c_buf_p) - YY_G(yytext_ptr);
++YY_G(yy_c_buf_p);
switch ( yy_get_next_buffer( M4_YY_CALL_ONLY_ARG ) )
@@ -2063,25 +2084,6 @@ static void yy_load_buffer_state YYFARG
}
-%if-c-only
-m4_ifdef( [[M4_YY_ALWAYS_INTERACTIVE]],,
-[[
- m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,
- [[
-#ifndef __cplusplus
-extern int isatty M4_YY_PARAMS( int );
-#endif /* __cplusplus */
- ]])
-]])
-%endif
-
-%if-c++-only
-m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,
-[[
-extern "C" int isatty M4_YY_PARAMS( int );
-]])
-%endif
-
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
* such as during a yyrestart() or at EOF.
@@ -2246,7 +2248,7 @@ static void yyensure_buffer_stack YYFARG
void yyFlexLexer::yyensure_buffer_stack(void)
%endif
{
- int num_to_alloc;
+ yy_size_t num_to_alloc;
M4_YY_DECL_GUTS_VAR();
if (!YY_G(yy_buffer_stack)) {
@@ -2361,12 +2363,12 @@ m4_ifdef( [[M4_YY_NO_SCAN_BYTES]],,
%if-c-only
/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
* scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
* M4_YY_DOC_PARAM
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,yybytes, int ,_yybytes_len)
+YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,yybytes, yy_size_t ,_yybytes_len)
{
YY_BUFFER_STATE b;
char *buf;
@@ -2592,7 +2594,7 @@ m4_ifdef( [[M4_YY_NO_GET_LENG]],,
/** Get the length of the current token.
* M4_YY_DOC_PARAM
*/
-int yyget_leng YYFARGS0(void)
+yy_size_t yyget_leng YYFARGS0(void)
{
M4_YY_DECL_GUTS_VAR();
return yyleng;
@@ -2640,7 +2642,7 @@ void yyset_lineno YYFARGS1( int ,_line_n
[[
/* lineno is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
- yy_fatal_error( "yyset_lineno called with no buffer" M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "yyset_lineno called with no buffer" );
]])
yylineno = _line_number;
}
@@ -2662,7 +2664,7 @@ void yyset_column YYFARGS1( int , _colum
[[
/* column is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
- yy_fatal_error( "yyset_column called with no buffer" M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "yyset_column called with no buffer" );
]])
yycolumn = _column_no;
}
@@ -3057,7 +3059,7 @@ static int yytbl_hdr_read YYFARGS2(struc
return -1;
if (th->th_magic != YYTBL_MAGIC){
- yy_fatal_error("bad magic number" /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "bad magic number" ); /* TODO: not fatal. */
return -1;
}
@@ -3068,7 +3070,7 @@ static int yytbl_hdr_read YYFARGS2(struc
/* Sanity check on header size. Greater than 1k suggests some funny business. */
if (th->th_hsize < 16 || th->th_hsize > 1024){
- yy_fatal_error("insane header size detected" /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "insane header size detected" ); /* TODO: not fatal. */
return -1;
}
@@ -3133,7 +3135,7 @@ static int yytbl_data_load YYFARGS2(stru
transdmap = yytbl_dmap_lookup (dmap, YYTD_ID_TRANSITION M4_YY_CALL_LAST_ARG);
if ((dmap = yytbl_dmap_lookup (dmap, td.td_id M4_YY_CALL_LAST_ARG)) == NULL){
- yy_fatal_error("table id not found in map." /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "table id not found in map." ); /* TODO: not fatal. */
return -1;
}
@@ -3200,7 +3202,7 @@ static int yytbl_data_load YYFARGS2(stru
t32 = t8;
break;
default:
- yy_fatal_error("invalid td_flags" /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "invalid td_flags" ); /* TODO: not fatal. */
return -1;
}
}
@@ -3220,26 +3222,26 @@ static int yytbl_data_load YYFARGS2(stru
case sizeof (flex_int32_t):
if (M4_YY_TABLES_VERIFY){
if( ((flex_int32_t *) v)[0] != (flex_int32_t) t32)
- yy_fatal_error("tables verification failed at YYTD_STRUCT flex_int32_t" M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "tables verification failed at YYTD_STRUCT flex_int32_t" );
}else
((flex_int32_t *) v)[0] = (flex_int32_t) t32;
break;
case sizeof (flex_int16_t):
if (M4_YY_TABLES_VERIFY ){
if(((flex_int16_t *) v)[0] != (flex_int16_t) t32)
- yy_fatal_error("tables verification failed at YYTD_STRUCT flex_int16_t" M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "tables verification failed at YYTD_STRUCT flex_int16_t" );
}else
((flex_int16_t *) v)[0] = (flex_int16_t) t32;
break;
case sizeof(flex_int8_t):
if (M4_YY_TABLES_VERIFY ){
if( ((flex_int8_t *) v)[0] != (flex_int8_t) t32)
- yy_fatal_error("tables verification failed at YYTD_STRUCT flex_int8_t" M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "tables verification failed at YYTD_STRUCT flex_int8_t" );
}else
((flex_int8_t *) v)[0] = (flex_int8_t) t32;
break;
default:
- yy_fatal_error("invalid dmap->dm_sz for struct" /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "invalid dmap->dm_sz for struct" ); /* TODO: not fatal. */
return -1;
}
@@ -3253,7 +3255,7 @@ static int yytbl_data_load YYFARGS2(stru
if (!transdmap){
- yy_fatal_error("transition table not found" /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "transition table not found" ); /* TODO: not fatal. */
return -1;
}
@@ -3264,7 +3266,7 @@ static int yytbl_data_load YYFARGS2(stru
if(M4_YY_TABLES_VERIFY ){
if( ((struct yy_trans_info **) p)[0] != v)
- yy_fatal_error("tables verification failed at YYTD_PTRANS" M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "tables verification failed at YYTD_PTRANS" );
}else
((struct yy_trans_info **) p)[0] = v;
@@ -3277,7 +3279,7 @@ static int yytbl_data_load YYFARGS2(stru
case sizeof (flex_int32_t):
if(M4_YY_TABLES_VERIFY ){
if( ((flex_int32_t *) p)[0] != (flex_int32_t) t32)
- yy_fatal_error("tables verification failed at flex_int32_t" M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "tables verification failed at flex_int32_t" );
}else
((flex_int32_t *) p)[0] = (flex_int32_t) t32;
p = ((flex_int32_t *) p) + 1;
@@ -3285,7 +3287,7 @@ static int yytbl_data_load YYFARGS2(stru
case sizeof (flex_int16_t):
if(M4_YY_TABLES_VERIFY ){
if( ((flex_int16_t *) p)[0] != (flex_int16_t) t32)
- yy_fatal_error("tables verification failed at flex_int16_t" M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "tables verification failed at flex_int16_t" );
}else
((flex_int16_t *) p)[0] = (flex_int16_t) t32;
p = ((flex_int16_t *) p) + 1;
@@ -3293,13 +3295,13 @@ static int yytbl_data_load YYFARGS2(stru
case sizeof (flex_int8_t):
if(M4_YY_TABLES_VERIFY ){
if( ((flex_int8_t *) p)[0] != (flex_int8_t) t32)
- yy_fatal_error("tables verification failed at flex_int8_t" M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "tables verification failed at flex_int8_t" );
}else
((flex_int8_t *) p)[0] = (flex_int8_t) t32;
p = ((flex_int8_t *) p) + 1;
break;
default:
- yy_fatal_error("invalid dmap->dm_sz for plain int" /*TODO: not fatal.*/ M4_YY_CALL_LAST_ARG);
+ YY_FATAL_ERROR( "invalid dmap->dm_sz for plain int" ); /* TODO: not fatal. */
return -1;
}
}
Index: src/external/bsd/flex/dist/flexdef.h
diff -u src/external/bsd/flex/dist/flexdef.h:1.2 src/external/bsd/flex/dist/flexdef.h:1.3
--- src/external/bsd/flex/dist/flexdef.h:1.2 Mon Oct 26 00:27:15 2009
+++ src/external/bsd/flex/dist/flexdef.h Sat Apr 6 10:27:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: flexdef.h,v 1.2 2009/10/26 04:27:15 christos Exp $ */
+/* $NetBSD: flexdef.h,v 1.3 2013/04/06 14:27:52 christos Exp $ */
/* flexdef - definitions file for flex */
@@ -93,7 +93,9 @@ char *alloca ();
#define true 1
#define false 0
#endif
+#ifdef HAVE_REGEX_H
#include <regex.h>
+#endif
#include "flexint.h"
/* We use gettext. So, when we write strings which should be translated, we mark them with _() */
@@ -416,7 +418,6 @@ extern int yymore_really_used, reject_re
* dataline - number of contiguous lines of data in current data
* statement. Used to generate readable -f output
* linenum - current input line number
- * out_linenum - current output line number
* skelfile - the skeleton file
* skel - compiled-in skeleton array
* skel_ind - index into "skel" array, if skelfile is nil
@@ -444,7 +445,7 @@ extern int yymore_really_used, reject_re
* to "action_array"
*/
-extern int datapos, dataline, linenum, out_linenum;
+extern int datapos, dataline, linenum;
extern FILE *skelfile, *yyin, *backing_up_file;
extern const char *skel[];
extern int skel_ind;
@@ -849,8 +850,8 @@ extern int all_lower PROTO ((register ch
/* True if a string is all upper case. */
extern int all_upper PROTO ((register char *));
-/* Bubble sort an integer array. */
-extern void bubble PROTO ((int[], int));
+/* Compare two integers for use by qsort. */
+extern int intcmp PROTO ((const void *, const void *));
/* Check a character to make sure it's in the expected range. */
extern void check_char PROTO ((int c));
@@ -864,8 +865,8 @@ extern char *copy_string PROTO ((registe
/* Returns a dynamically allocated copy of a (potentially) unsigned string. */
extern Char *copy_unsigned_string PROTO ((register Char *));
-/* Shell sort a character array. */
-extern void cshell PROTO ((Char[], int, int));
+/* Compare two characters for use by qsort with '\0' sorting last. */
+extern int cclcmp PROTO ((const void *, const void *));
/* Finish up a block of data declarations. */
extern void dataend PROTO ((void));
@@ -939,7 +940,6 @@ extern void out PROTO ((const char *));
extern void out_dec PROTO ((const char *, int));
extern void out_dec2 PROTO ((const char *, int, int));
extern void out_hex PROTO ((const char *, unsigned int));
-extern void out_line_count PROTO ((const char *));
extern void out_str PROTO ((const char *, const char *));
extern void out_str3
PROTO ((const char *, const char *, const char *, const char *));
@@ -1221,5 +1221,11 @@ extern void sf_init(void);
extern void sf_push(void);
extern void sf_pop(void);
+/*
+ * From "misc.c"
+ */
+void lerrsf_fatal (const char *msg, ...) __printflike(1, 2);
+
+
#endif /* not defined FLEXDEF_H */
Index: src/external/bsd/flex/dist/misc.c
diff -u src/external/bsd/flex/dist/misc.c:1.2 src/external/bsd/flex/dist/misc.c:1.3
--- src/external/bsd/flex/dist/misc.c:1.2 Mon Oct 26 00:27:15 2009
+++ src/external/bsd/flex/dist/misc.c Sat Apr 6 10:27:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.2 2009/10/26 04:27:15 christos Exp $ */
+/* $NetBSD: misc.c,v 1.3 2013/04/06 14:27:52 christos Exp $ */
/* misc - miscellaneous flex routines */
@@ -35,6 +35,7 @@
#include "flexdef.h"
#include "tables.h"
+#include <stdarg.h>
#define CMD_IF_TABLES_SER "%if-tables-serialization"
#define CMD_TABLES_YYDMAP "%tables-yydmap"
@@ -63,6 +64,8 @@ static void sko_push(bool dc)
if(!sko_stack){
sko_sz = 1;
sko_stack = (struct sko_state*)flex_alloc(sizeof(struct sko_state)*sko_sz);
+ if (!sko_stack)
+ flexfatal(_("allocation of sko_stack failed"));
sko_len = 0;
}
if(sko_len >= sko_sz){
@@ -188,7 +191,7 @@ int all_lower (str)
register char *str;
{
while (*str) {
- if (!isascii ((Char)*str) || !islower ((Char)*str))
+ if (!isascii ((Char) * str) || !islower ((Char) * str))
return 0;
++str;
}
@@ -203,7 +206,7 @@ int all_upper (str)
register char *str;
{
while (*str) {
- if (!isascii ((Char)*str) || !isupper ((Char)*str))
+ if (!isascii ((Char) * str) || !isupper ((Char) * str))
return 0;
++str;
}
@@ -212,33 +215,11 @@ int all_upper (str)
}
-/* bubble - bubble sort an integer array in increasing order
- *
- * synopsis
- * int v[n], n;
- * void bubble( v, n );
- *
- * description
- * sorts the first n elements of array v and replaces them in
- * increasing order.
- *
- * passed
- * v - the array to be sorted
- * n - the number of elements of 'v' to be sorted
- */
+/* intcmp - compares two integers for use by qsort. */
-void bubble (v, n)
- int v[], n;
+int intcmp (const void *a, const void *b)
{
- register int i, j, k;
-
- for (i = n; i > 1; --i)
- for (j = 1; j < i; ++j)
- if (v[j] > v[j + 1]) { /* compare */
- k = v[j]; /* exchange */
- v[j] = v[j + 1];
- v[j + 1] = k;
- }
+ return *(const int *) a - *(const int *) b;
}
@@ -318,52 +299,17 @@ Char *copy_unsigned_string (str)
}
-/* cshell - shell sort a character array in increasing order
- *
- * synopsis
- *
- * Char v[n];
- * int n, special_case_0;
- * cshell( v, n, special_case_0 );
- *
- * description
- * Does a shell sort of the first n elements of array v.
- * If special_case_0 is true, then any element equal to 0
- * is instead assumed to have infinite weight.
- *
- * passed
- * v - array to be sorted
- * n - number of elements of v to be sorted
- */
+/* cclcmp - compares two characters for use by qsort with '\0' sorting last. */
-void cshell (v, n, special_case_0)
- Char v[];
- int n, special_case_0;
-{
- int gap, i, j, jg;
- Char k;
-
- for (gap = n / 2; gap > 0; gap = gap / 2)
- for (i = gap; i < n; ++i)
- for (j = i - gap; j >= 0; j = j - gap) {
- jg = j + gap;
-
- if (special_case_0) {
- if (v[jg] == 0)
- break;
-
- else if (v[j] != 0
- && v[j] <= v[jg])
- break;
- }
-
- else if (v[j] <= v[jg])
- break;
-
- k = v[j];
- v[j] = v[jg];
- v[jg] = k;
- }
+int cclcmp (const void *a, const void *b)
+{
+ if (!*(const Char *) a)
+ return 1;
+ else
+ if (!*(const Char *) b)
+ return - 1;
+ else
+ return *(const Char *) a - *(const Char *) b;
}
@@ -458,15 +404,31 @@ void lerrif (msg, arg)
/* lerrsf - report an error message formatted with one string argument */
void lerrsf (msg, arg)
- const char *msg, arg[];
+ const char *msg, arg[];
{
char errmsg[MAXLINE];
- snprintf (errmsg, sizeof(errmsg), msg, arg);
+ snprintf (errmsg, sizeof(errmsg)-1, msg, arg);
+ errmsg[sizeof(errmsg)-1] = 0; /* ensure NULL termination */
flexerror (errmsg);
}
+/* lerrsf_fatal - as lerrsf, but call flexfatal */
+
+void lerrsf_fatal (const char *msg, ...)
+{
+ char errmsg[MAXLINE];
+ va_list ap;
+
+ va_start(ap, msg);
+ vsnprintf (errmsg, sizeof(errmsg)-1, msg, ap);
+ va_end(ap);
+ errmsg[sizeof(errmsg)-1] = 0; /* ensure NULL termination */
+ flexfatal (errmsg);
+}
+
+
/* line_directive_out - spit out a "#line" statement */
void line_directive_out (output_file, do_infile)
@@ -501,11 +463,7 @@ void line_directive_out (output_file, do
if (do_infile)
snprintf (directive, sizeof(directive), line_fmt, linenum, filename);
else {
- if (output_file == stdout)
- /* Account for the line directive itself. */
- ++out_linenum;
-
- snprintf (directive, sizeof(directive), line_fmt, out_linenum, filename);
+ snprintf (directive, sizeof(directive), line_fmt, 0, filename);
}
/* If output_file is nil then we should put the directive in
@@ -679,7 +637,7 @@ Char myesc (array)
int sptr = 2;
while (isascii (array[sptr]) &&
- isxdigit ((Char)array[sptr]))
+ isxdigit (array[sptr]))
/* Don't increment inside loop control
* because if isdigit() is a macro it might
* expand into multiple increments ...
@@ -722,7 +680,6 @@ void out (str)
const char *str;
{
fputs (str, stdout);
- out_line_count (str);
}
void out_dec (fmt, n)
@@ -730,7 +687,6 @@ void out_dec (fmt, n)
int n;
{
fprintf (stdout, fmt, n);
- out_line_count (fmt);
}
void out_dec2 (fmt, n1, n2)
@@ -738,7 +694,6 @@ void out_dec2 (fmt, n1, n2)
int n1, n2;
{
fprintf (stdout, fmt, n1, n2);
- out_line_count (fmt);
}
void out_hex (fmt, x)
@@ -746,35 +701,18 @@ void out_hex (fmt, x)
unsigned int x;
{
fprintf (stdout, fmt, x);
- out_line_count (fmt);
-}
-
-void out_line_count (str)
- const char *str;
-{
- register int i;
-
- for (i = 0; str[i]; ++i)
- if (str[i] == '\n')
- ++out_linenum;
}
void out_str (fmt, str)
const char *fmt, str[];
{
fprintf (stdout,fmt, str);
- out_line_count (fmt);
- out_line_count (str);
}
void out_str3 (fmt, s1, s2, s3)
const char *fmt, s1[], s2[], s3[];
{
fprintf (stdout,fmt, s1, s2, s3);
- out_line_count (fmt);
- out_line_count (s1);
- out_line_count (s2);
- out_line_count (s3);
}
void out_str_dec (fmt, str, n)
@@ -782,17 +720,12 @@ void out_str_dec (fmt, str, n)
int n;
{
fprintf (stdout,fmt, str, n);
- out_line_count (fmt);
- out_line_count (str);
}
void outc (c)
int c;
{
fputc (c, stdout);
-
- if (c == '\n')
- ++out_linenum;
}
void outn (str)
@@ -800,8 +733,6 @@ void outn (str)
{
fputs (str,stdout);
fputc('\n',stdout);
- out_line_count (str);
- ++out_linenum;
}
/** Print "m4_define( [[def]], [[val]])m4_dnl\n".
Index: src/external/bsd/flex/dist/parse.y
diff -u src/external/bsd/flex/dist/parse.y:1.2 src/external/bsd/flex/dist/parse.y:1.3
--- src/external/bsd/flex/dist/parse.y:1.2 Mon Oct 26 00:27:15 2009
+++ src/external/bsd/flex/dist/parse.y Sat Apr 6 10:27:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.y,v 1.2 2009/10/26 04:27:15 christos Exp $ */
+/* $NetBSD: parse.y,v 1.3 2013/04/06 14:27:52 christos Exp $ */
/* parse.y - parser for flex input */
@@ -725,11 +725,9 @@ singleton : singleton '*'
| fullccl
{
- /* Sort characters for fast searching. We
- * use a shell sort since this list could
- * be large.
+ /* Sort characters for fast searching.
*/
- cshell( ccltbl + cclmap[$1], ccllen[$1], true );
+ qsort( ccltbl + cclmap[$1], ccllen[$1], sizeof (*ccltbl), cclcmp );
if ( useecs )
mkeccl( ccltbl + cclmap[$1], ccllen[$1],
@@ -970,6 +968,10 @@ void build_eof_action()
else
{
sceof[scon_stk[i]] = true;
+
+ if (previous_continued_action /* && previous action was regular */)
+ add_action("YY_RULE_SETUP\n");
+
snprintf( action_text, sizeof(action_text), "case YY_STATE_EOF(%s):\n",
scname[scon_stk[i]] );
add_action( action_text );
Index: src/external/bsd/flex/dist/scanopt.c
diff -u src/external/bsd/flex/dist/scanopt.c:1.2 src/external/bsd/flex/dist/scanopt.c:1.3
--- src/external/bsd/flex/dist/scanopt.c:1.2 Mon Oct 26 00:27:15 2009
+++ src/external/bsd/flex/dist/scanopt.c Sat Apr 6 10:27:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: scanopt.c,v 1.2 2009/10/26 04:27:15 christos Exp $ */
+/* $NetBSD: scanopt.c,v 1.3 2013/04/06 14:27:52 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -191,7 +191,7 @@ scanopt_t *scanopt_init (options, argc,
s->aux = (struct _aux *) malloc (s->optc * sizeof (struct _aux));
for (i = 0; i < s->optc; i++) {
- const char *p, *pname;
+ const Char *p, *pname;
const struct optspec_t *opt;
struct _aux *aux;
@@ -202,11 +202,11 @@ scanopt_t *scanopt_init (options, argc,
if (opt->opt_fmt[0] == '-' && opt->opt_fmt[1] == '-') {
aux->flags |= IS_LONG;
- pname = opt->opt_fmt + 2;
+ pname = (const Char *)(opt->opt_fmt + 2);
s->has_long = 1;
}
else {
- pname = opt->opt_fmt + 1;
+ pname = (const Char *)(opt->opt_fmt + 1);
s->has_short = 1;
}
aux->printlen = strlen (opt->opt_fmt);
@@ -483,7 +483,7 @@ int scanopt_usage (scanner, fp, usag
while (*p && n < maxlen[1]
&& *p != '\n') {
- if (isspace ((unsigned char)*p)
+ if (isspace ((Char)(*p))
|| *p == '-') lastws =
p;
n++;
@@ -506,8 +506,7 @@ int scanopt_usage (scanner, fp, usag
if (lastws) {
fprintf (fp,
"%.*s\n",
- (int)(lastws -
- pstart),
+ (int)(lastws - pstart),
pstart);
pstart =
lastws + 1;
Index: src/external/bsd/flex/dist/tables.c
diff -u src/external/bsd/flex/dist/tables.c:1.2 src/external/bsd/flex/dist/tables.c:1.3
--- src/external/bsd/flex/dist/tables.c:1.2 Mon Oct 26 00:27:15 2009
+++ src/external/bsd/flex/dist/tables.c Sat Apr 6 10:27:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tables.c,v 1.2 2009/10/26 04:27:15 christos Exp $ */
+/* $NetBSD: tables.c,v 1.3 2013/04/06 14:27:52 christos Exp $ */
/* tables.c - tables serialization code
*
@@ -59,10 +59,10 @@ int yytbl_write16 (struct yytbl_writ
int yytbl_write8 (struct yytbl_writer *wr, flex_uint8_t v);
int yytbl_writen (struct yytbl_writer *wr, void *v, flex_int32_t len);
static flex_int32_t yytbl_data_geti (const struct yytbl_data *tbl, int i);
-#ifdef notdef
+/* XXX Not used
static flex_int32_t yytbl_data_getijk (const struct yytbl_data *tbl, int i,
int j, int k);
-#endif
+ */
/** Initialize the table writer.
@@ -334,6 +334,8 @@ int yytbl_write8 (struct yytbl_writer *w
}
+/* XXX Not Used */
+#if 0
/** Extract data element [i][j] from array data tables.
* @param tbl data table
* @param i index into higher dimension array. i should be zero for one-dimensional arrays.
@@ -341,7 +343,6 @@ int yytbl_write8 (struct yytbl_writer *w
* @param k index into struct, must be 0 or 1. Only valid for YYTD_ID_TRANSITION table
* @return data[i][j + k]
*/
-#ifdef notdef
static flex_int32_t yytbl_data_getijk (const struct yytbl_data *tbl, int i,
int j, int k)
{
@@ -369,7 +370,7 @@ static flex_int32_t yytbl_data_getijk (c
return 0;
}
-#endif
+#endif /* Not used */
/** Extract data element [i] from array data tables treated as a single flat array of integers.
* Be careful for 2-dimensional arrays or for YYTD_ID_TRANSITION, which is an array
Index: src/external/bsd/flex/dist/gen.c
diff -u src/external/bsd/flex/dist/gen.c:1.6 src/external/bsd/flex/dist/gen.c:1.7
--- src/external/bsd/flex/dist/gen.c:1.6 Tue Apr 6 13:39:47 2010
+++ src/external/bsd/flex/dist/gen.c Sat Apr 6 10:27:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gen.c,v 1.6 2010/04/06 17:39:47 christos Exp $ */
+/* $NetBSD: gen.c,v 1.7 2013/04/06 14:27:52 christos Exp $ */
/* gen - actual generation (writing) of flex scanners */
Index: src/external/bsd/flex/dist/main.c
diff -u src/external/bsd/flex/dist/main.c:1.3 src/external/bsd/flex/dist/main.c:1.4
--- src/external/bsd/flex/dist/main.c:1.3 Mon Dec 26 12:32:28 2011
+++ src/external/bsd/flex/dist/main.c Sat Apr 6 10:27:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.3 2011/12/26 17:32:28 njoly Exp $ */
+/* $NetBSD: main.c,v 1.4 2013/04/06 14:27:52 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -59,7 +59,7 @@ int C_plus_plus, long_align, use_rea
int reentrant, bison_bridge_lval, bison_bridge_lloc;
int yymore_used, reject, real_reject, continued_action, in_rule;
int yymore_really_used, reject_really_used;
-int datapos, dataline, linenum, out_linenum;
+int datapos, dataline, linenum;
FILE *skelfile = NULL;
int skel_ind = 0;
char *action_array;
@@ -457,6 +457,8 @@ void check_options ()
size_t strsz;
str = (char*)flex_alloc(strsz = strlen(fmt) + strlen(scname[i]) + (int)(1 + log10(i)) + 2);
+ if (!str)
+ flexfatal(_("allocation of macro definition failed"));
snprintf(str, strsz, fmt, scname[i], i - 1);
buf_strappend(&tmpbuf, str);
free(str);
@@ -1443,7 +1445,7 @@ void flexinit (argc, argv)
num_backing_up = onesp = numprots = 0;
variable_trailing_context_rules = bol_needed = false;
- out_linenum = linenum = sectnum = 1;
+ linenum = sectnum = 1;
firstprot = NIL;
/* Used in mkprot() so that the first proto goes in slot 1
@@ -1579,7 +1581,10 @@ void readin ()
if (!do_yywrap) {
if (!C_plus_plus) {
- outn ("\n#define yywrap(n) (/*CONSTCOND*/1)");
+ if (reentrant)
+ outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)");
+ else
+ outn ("\n#define yywrap() (/*CONSTCOND*/1)");
}
outn ("#define YY_SKIP_YYWRAP");
}
Index: src/external/bsd/flex/dist/scan.l
diff -u src/external/bsd/flex/dist/scan.l:1.3 src/external/bsd/flex/dist/scan.l:1.4
--- src/external/bsd/flex/dist/scan.l:1.3 Wed Apr 7 12:14:07 2010
+++ src/external/bsd/flex/dist/scan.l Sat Apr 6 10:27:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: scan.l,v 1.3 2010/04/07 16:14:07 christos Exp $ */
+/* $NetBSD: scan.l,v 1.4 2013/04/06 14:27:52 christos Exp $ */
/* scan.l - scanner for flex input -*-C-*- */
@@ -191,7 +191,7 @@ M4QEND "]]"
}
else
{
- synerr( _("Input line too long\n"));
+ synerr( _("Definition name too long\n"));
FLEX_EXIT(EXIT_FAILURE);
}
@@ -299,7 +299,7 @@ M4QEND "]]"
}
else
{
- synerr( _("Input line too long\n"));
+ format_synerr( _("Definition value for {%s} too long\n"), nmstr);
FLEX_EXIT(EXIT_FAILURE);
}
/* Skip trailing whitespace. */
@@ -442,7 +442,7 @@ M4QEND "]]"
}
else
{
- synerr( _("Input line too long\n"));
+ synerr( _("Option line too long\n"));
FLEX_EXIT(EXIT_FAILURE);
}
nmstr[strlen( nmstr ) - 1] = '\0';
@@ -885,7 +885,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /
}
}
- {M4QSTART} ACTION_ECHO_QEND;
+ {M4QSTART} ACTION_ECHO_QSTART;
{M4QEND} ACTION_ECHO_QEND;
. ACTION_ECHO;
{NL} {
@@ -908,7 +908,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /
<ACTION>{
"{" ACTION_ECHO; ++bracelevel;
"}" ACTION_ECHO; --bracelevel;
- {M4QSTART} ACTION_ECHO_QEND;
+ {M4QSTART} ACTION_ECHO_QSTART;
{M4QEND} ACTION_ECHO_QEND;
[^[:alpha:]_{}"'/\n\[\]]+ ACTION_ECHO;
[\[\]] ACTION_ECHO;
Index: src/external/bsd/flex/include/config.h
diff -u src/external/bsd/flex/include/config.h:1.2 src/external/bsd/flex/include/config.h:1.3
--- src/external/bsd/flex/include/config.h:1.2 Mon Oct 26 17:30:02 2009
+++ src/external/bsd/flex/include/config.h Sat Apr 6 10:27:53 2013
@@ -1,4 +1,4 @@
-/* config.h. Generated by configure. */
+/* config.h. Generated from conf.in by configure. */
/* conf.in. Generated from configure.in by autoheader. */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
@@ -86,6 +86,9 @@
/* Define to 1 if you have the `regcomp' function. */
#define HAVE_REGCOMP 1
+/* Define to 1 if you have the <regex.h> header file. */
+#define HAVE_REGEX_H 1
+
/* Define to 1 if you have the `setlocale' function. */
#define HAVE_SETLOCALE 1
@@ -113,9 +116,6 @@
/* Define to 1 if you have the `strtol' function. */
#define HAVE_STRTOL 1
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
@@ -134,7 +134,6 @@
/* Define to 1 if you have the <vfork.h> header file. */
/* #undef HAVE_VFORK_H */
-
/* Define to 1 if `fork' works. */
#define HAVE_WORKING_FORK 1
@@ -144,10 +143,11 @@
/* Define to 1 if the system has the type `_Bool'. */
#define HAVE__BOOL 1
-/* Define to the GNU M4 executable name. */
-#ifndef M4
+/* Define to the m4 executable name. */
#define M4 "/usr/bin/m4"
-#endif
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
/* Name of package */
#define PACKAGE "flex"
@@ -159,17 +159,20 @@
#define PACKAGE_NAME "the fast lexical analyser generator"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "the fast lexical analyser generator 2.5.35"
+#define PACKAGE_STRING "the fast lexical analyser generator 2.5.37"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "flex"
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.35"
+#define PACKAGE_VERSION "2.5.37"
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
+ automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
@@ -179,7 +182,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "2.5.35"
+#define VERSION "2.5.37"
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
@@ -197,7 +200,7 @@
/* Define to rpl_realloc if the replacement function should be used. */
/* #undef realloc */
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
/* #undef size_t */
/* Define as `fork' if `vfork' does not work. */
