? 1.txt Index: src/Parse.yacc =================================================================== RCS file: /usr/cvs/cm3/m3-tools/pp/src/Parse.yacc,v retrieving revision 1.2 diff -u -r1.2 Parse.yacc --- src/Parse.yacc 17 Nov 2005 03:23:56 -0000 1.2 +++ src/Parse.yacc 18 Jul 2010 04:34:25 -0000 @@ -91,7 +91,7 @@ %{ -#define NULL (0L) +#include #define lexbufsize 500 char lexbuf[2 * lexbufsize]; Index: src/flex-bison/lex.yy.c =================================================================== RCS file: /usr/cvs/cm3/m3-tools/pp/src/flex-bison/lex.yy.c,v retrieving revision 1.2 diff -u -r1.2 lex.yy.c --- src/flex-bison/lex.yy.c 17 Nov 2005 03:23:57 -0000 1.2 +++ src/flex-bison/lex.yy.c 18 Jul 2010 04:34:25 -0000 @@ -9,7 +9,8 @@ #define YY_FLEX_MINOR_VERSION 5 #include - +#include +#include /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus @@ -21,9 +22,6 @@ #ifdef __cplusplus -#include -#include - /* Use prototypes in function declarations. */ #define YY_USE_PROTOS @@ -44,7 +42,6 @@ #pragma warn -rch #pragma warn -use #include -#include #define YY_USE_CONST #define YY_USE_PROTOS #endif @@ -581,17 +578,6 @@ #ifdef YY_MALLOC_DECL YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif #endif /* Amount of stuff to slurp up with each read. */ Index: src/flex-bison/y.tab.c =================================================================== RCS file: /usr/cvs/cm3/m3-tools/pp/src/flex-bison/y.tab.c,v retrieving revision 1.2 diff -u -r1.2 y.tab.c --- src/flex-bison/y.tab.c 17 Nov 2005 03:23:57 -0000 1.2 +++ src/flex-bison/y.tab.c 18 Jul 2010 04:34:26 -0000 @@ -33,6 +33,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ +#include +#include +#include +#define YYSIZE_T size_t + /* Identify Bison output. */ #define YYBISON 1 @@ -333,8 +338,6 @@ #line 92 "../Parse.yacc" -#define NULL (0L) - #define lexbufsize 500 char lexbuf[2 * lexbufsize]; int lexptr = 0; @@ -464,10 +467,6 @@ /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE # endif @@ -504,7 +503,7 @@ # define YYCOPY(To, From, Count) \ do \ { \ - register YYSIZE_T yyi; \ + register size_t yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ @@ -520,7 +519,7 @@ # define YYSTACK_RELOCATE(Stack) \ do \ { \ - YYSIZE_T yynewbytes; \ + size_t yynewbytes; \ YYCOPY (&yyptr->Stack, Stack, yysize); \ Stack = &yyptr->Stack; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ @@ -3476,22 +3475,6 @@ 655, 655, 655, 655, 655, 655 }; -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -3586,7 +3569,6 @@ #if YYDEBUG # ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ # define YYFPRINTF fprintf # endif @@ -3700,7 +3682,7 @@ # define yystrlen strlen # else /* Return the length of YYSTR. */ -static YYSIZE_T +static size_t # if defined (__STDC__) || defined (__cplusplus) yystrlen (const char *yystr) # else @@ -3899,7 +3881,7 @@ #define YYPOPSTACK (yyvsp--, yyssp--) - YYSIZE_T yystacksize = YYINITDEPTH; + size_t yystacksize = YYINITDEPTH; /* The variables used to return semantic value and location from the action routines. */ @@ -3945,7 +3927,7 @@ if (yyss + yystacksize - 1 <= yyssp) { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + size_t yysize = yyssp - yyss + 1; #ifdef yyoverflow { @@ -4996,7 +4978,7 @@ if (YYPACT_NINF < yyn && yyn < YYLAST) { - YYSIZE_T yysize = 0; + size_t yysize = 0; int yytype = YYTRANSLATE (yychar); const char* yyprefix; char *yymsg; Index: src/lex-yacc/lex.yy.c =================================================================== RCS file: /usr/cvs/cm3/m3-tools/pp/src/lex-yacc/lex.yy.c,v retrieving revision 1.3 diff -u -r1.3 lex.yy.c --- src/lex-yacc/lex.yy.c 17 Nov 2005 03:23:57 -0000 1.3 +++ src/lex-yacc/lex.yy.c 18 Jul 2010 04:34:27 -0000 @@ -9,7 +9,9 @@ #define YY_FLEX_MINOR_VERSION 5 #include - +#include +#include +#include /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus @@ -21,9 +23,6 @@ #ifdef __cplusplus -#include -#include - /* Use prototypes in function declarations. */ #define YY_USE_PROTOS @@ -44,7 +43,6 @@ #pragma warn -rch #pragma warn -use #include -#include #define YY_USE_CONST #define YY_USE_PROTOS #endif @@ -581,17 +579,6 @@ #ifdef YY_MALLOC_DECL YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif #endif /* Amount of stuff to slurp up with each read. */ Index: src/lex-yacc/y.tab.c =================================================================== RCS file: /usr/cvs/cm3/m3-tools/pp/src/lex-yacc/y.tab.c,v retrieving revision 1.2 diff -u -r1.2 y.tab.c --- src/lex-yacc/y.tab.c 17 Nov 2005 03:23:57 -0000 1.2 +++ src/lex-yacc/y.tab.c 18 Jul 2010 04:34:28 -0000 @@ -33,6 +33,10 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ +#include +#include +#define YYSIZE_T size_t + /* Identify Bison output. */ #define YYBISON 1 @@ -333,8 +337,6 @@ #line 92 "../Parse.yacc" -#define NULL (0L) - #define lexbufsize 500 char lexbuf[2 * lexbufsize]; int lexptr = 0; @@ -464,10 +466,6 @@ /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE # endif @@ -504,7 +502,7 @@ # define YYCOPY(To, From, Count) \ do \ { \ - register YYSIZE_T yyi; \ + register size_t yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ @@ -520,7 +518,7 @@ # define YYSTACK_RELOCATE(Stack) \ do \ { \ - YYSIZE_T yynewbytes; \ + size_t yynewbytes; \ YYCOPY (&yyptr->Stack, Stack, yysize); \ Stack = &yyptr->Stack; \ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ @@ -3476,22 +3474,6 @@ 655, 655, 655, 655, 655, 655 }; -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -3700,7 +3682,7 @@ # define yystrlen strlen # else /* Return the length of YYSTR. */ -static YYSIZE_T +static size_t # if defined (__STDC__) || defined (__cplusplus) yystrlen (const char *yystr) # else @@ -3899,7 +3881,7 @@ #define YYPOPSTACK (yyvsp--, yyssp--) - YYSIZE_T yystacksize = YYINITDEPTH; + size_t yystacksize = YYINITDEPTH; /* The variables used to return semantic value and location from the action routines. */ @@ -3945,7 +3927,7 @@ if (yyss + yystacksize - 1 <= yyssp) { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + size_t yysize = yyssp - yyss + 1; #ifdef yyoverflow { @@ -4996,7 +4978,7 @@ if (YYPACT_NINF < yyn && yyn < YYLAST) { - YYSIZE_T yysize = 0; + size_t yysize = 0; int yytype = YYTRANSLATE (yychar); const char* yyprefix; char *yymsg; Index: src/lex-yacc-HPPA/lex.yy.c =================================================================== RCS file: /usr/cvs/cm3/m3-tools/pp/src/lex-yacc-HPPA/lex.yy.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 lex.yy.c --- src/lex-yacc-HPPA/lex.yy.c 13 Jan 2001 14:47:04 -0000 1.1.1.1 +++ src/lex-yacc-HPPA/lex.yy.c 18 Jul 2010 04:34:28 -0000 @@ -1,4 +1,5 @@ -# include "stdio.h" +#include + #ifdef __cplusplus extern "C" { extern int yyreject(); Index: src/lex-yacc-HPPA/y.tab.c =================================================================== RCS file: /usr/cvs/cm3/m3-tools/pp/src/lex-yacc-HPPA/y.tab.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 y.tab.c --- src/lex-yacc-HPPA/y.tab.c 13 Jan 2001 14:47:05 -0000 1.1.1.1 +++ src/lex-yacc-HPPA/y.tab.c 18 Jul 2010 04:34:28 -0000 @@ -2,6 +2,9 @@ /* A Bison parser, made from ../Parse.yacc with Bison version GNU Bison version 1.22 */ +#include +#include + #define YYBISON 1 /* Identify Bison output. */ #define ENDOFFILE 258 @@ -202,7 +205,6 @@ #ifndef YYSTYPE #define YYSTYPE int #endif -#include #ifndef __cplusplus #ifndef __STDC__