git: 7736adb5e64b - stable/13 - usr.bin/lex: regenerate bootstrap files after d37f81e35b

Alex Richardson arichardson at FreeBSD.org
Tue May 11 10:31:13 UTC 2021


The branch stable/13 has been updated by arichardson:

URL: https://cgit.FreeBSD.org/src/commit/?id=7736adb5e64b460fb568b626551a8fd7c0f0c939

commit 7736adb5e64b460fb568b626551a8fd7c0f0c939
Author:     Alex Richardson <arichardson at FreeBSD.org>
AuthorDate: 2021-04-21 09:50:33 +0000
Commit:     Alex Richardson <arichardson at FreeBSD.org>
CommitDate: 2021-05-11 08:39:30 +0000

    usr.bin/lex: regenerate bootstrap files after d37f81e35b
    
    Reviewed by:    jkim
    
    (cherry picked from commit c6e66cbfbbd1c5dec215cf91a79689037255171c)
---
 usr.bin/lex/initscan.c | 16 +++++-----------
 usr.bin/lex/initskel.c |  8 +-------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index 9b6fb4ae5183..5c2701d060da 100644
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -15,12 +15,6 @@
 
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
-#if defined(__FreeBSD__)
-#include <sys/cdefs.h>
-#else
-#define	__dead2
-#endif
-
 /* begin standard C headers. */
 #include <stdio.h>
 #include <string.h>
@@ -348,7 +342,7 @@ extern char *yytext;
 static yy_state_type yy_get_previous_state ( void );
 static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
 static int yy_get_next_buffer ( void );
-static void yynoreturn yy_fatal_error ( const char* msg  ) __dead2;
+static void yynoreturn yy_fatal_error ( const char* msg  );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
@@ -1971,9 +1965,9 @@ extern int yylval;
     if (!indented_code) line_directive_out(NULL, 0);\
 } while (0)
 
-#line 1974 "<stdout>"
+#line 1968 "<stdout>"
 
-#line 1976 "<stdout>"
+#line 1970 "<stdout>"
 
 #define INITIAL 0
 #define SECT2 1
@@ -2239,7 +2233,7 @@ YY_DECL
 	char nmdef[MAXLINE];
 
 
-#line 2242 "<stdout>"
+#line 2236 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -4140,7 +4134,7 @@ YY_RULE_SETUP
 #line 1014 "scan.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 4143 "<stdout>"
+#line 4137 "<stdout>"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(SECT2):
 case YY_STATE_EOF(CODEBLOCK):
diff --git a/usr.bin/lex/initskel.c b/usr.bin/lex/initskel.c
index 53a0ae452aa8..746ad6405c2a 100644
--- a/usr.bin/lex/initskel.c
+++ b/usr.bin/lex/initskel.c
@@ -446,12 +446,6 @@ const char *skel[] = {
   "",
   "/* First, we deal with  platform-specific or compiler-specific issues. */",
   "",
-  "#if defined(__FreeBSD__)",
-  "#include <sys/cdefs.h>",
-  "#else",
-  "#define	__dead2",
-  "#endif",
-  "",
   "/* begin standard C headers. */",
   "%if-c-only",
   "#include <stdio.h>",
@@ -943,7 +937,7 @@ const char *skel[] = {
   "static yy_state_type yy_get_previous_state ( M4_YY_PROTO_ONLY_ARG );",
   "static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  M4_YY_PROTO_LAST_ARG);",
   "static int yy_get_next_buffer ( M4_YY_PROTO_ONLY_ARG );",
-  "static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG ) __dead2;",
+  "static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG );",
   "]])",
   "",
   "%endif",


More information about the dev-commits-src-all mailing list