git: 25fb1c01f86e - stable/13 - contrib/flex: Drop local __dead2 patch
Alex Richardson
arichardson at FreeBSD.org
Tue May 11 10:31:11 UTC 2021
The branch stable/13 has been updated by arichardson:
URL: https://cgit.FreeBSD.org/src/commit/?id=25fb1c01f86e68b9712506bb67d46b8ab53c4964
commit 25fb1c01f86e68b9712506bb67d46b8ab53c4964
Author: Alex Richardson <arichardson at FreeBSD.org>
AuthorDate: 2021-04-21 09:48:55 +0000
Commit: Alex Richardson <arichardson at FreeBSD.org>
CommitDate: 2021-05-11 08:39:29 +0000
contrib/flex: Drop local __dead2 patch
Upstream flex has added a yynoreturn macro, so this diff is no longer
needed. Partially reverts r181269.
Reviewed By: jkim
Differential Revision: https://reviews.freebsd.org/D29679
(cherry picked from commit d37f81e35b6e8f114b04315e06bab2cf0c03946c)
---
contrib/flex/src/flex.skl | 8 +-------
1 file changed, 1 insertion(+), 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
More information about the dev-commits-src-branches
mailing list