diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2021-04-19 23:05:30 +0000 |
|---|---|---|
| committer | Alex Richardson <arichardson@FreeBSD.org> | 2021-04-20 00:46:42 +0000 |
| commit | bbd421cdf6d8c6102e6fd3979c5bec21ace3c2e3 (patch) | |
| tree | 0a992e51e25c07e7e790c9bd718446c7e1d61677 /contrib | |
| parent | ba1182e26376987fe424707b2abc4d6532b28623 (diff) | |
| download | src-bbd421cdf6d8c6102e6fd3979c5bec21ace3c2e3.tar.gz src-bbd421cdf6d8c6102e6fd3979c5bec21ace3c2e3.zip | |
contrib/flex: Drop local __dead2 patch
Upstream flex has added a yynoreturn, so this diff is no longer needed.
Partially reverts r181269. Also regenerate the pre-generated files that
are used for bootstrapping.
Reviewed By: jkim
Differential Revision: https://reviews.freebsd.org/D29679
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/flex/src/flex.skl | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/contrib/flex/src/flex.skl b/contrib/flex/src/flex.skl index c23b944ea473..304e664e4c62 100644 --- a/contrib/flex/src/flex.skl +++ b/contrib/flex/src/flex.skl @@ -216,12 +216,6 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]], /* 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> @@ -653,7 +647,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], 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 |