From 8575d0e84bf52b17f13bba9ba4d1de90bb6608a4 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 1 Jun 2022 13:14:27 +0200 Subject: [PATCH] meson: modernize win_flex stdint.h logic Since this logic was written, we've moved to require C11, so this can now be simplified. First of all, we no longer need to set __STDC_VERSION__ for C code at all, because the issue that MSVC doesn't set __STDC_VERSION__ for C99 is longer a concern. Second, we can make the C++ check unconditional. Reviewed-by: Jesse Natalie Reviewed-by: Alyssa Rosenzweig Reviewed-by: Eric Engestrom Part-of: --- meson.build | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index d6b49c8dd02..fe6b0c63abb 100644 --- a/meson.build +++ b/meson.build @@ -1916,22 +1916,16 @@ if build_machine.system() == 'windows' # windows compatibility (uses instead of and _isatty, # _fileno functions) prog_flex = [prog_flex, '--wincompat'] - if get_option('c_std') == 'c99' - prog_flex += '-D__STDC_VERSION__=199901' - endif else prog_flex = [find_program('flex', 'lex', required : with_any_opengl)] endif # Force flex to use const keyword in prototypes, as relies on __cplusplus or - # __STDC__ macro to determine whether it's safe to use const keyword, but - # MSVC only defines __STDC_VERSION__ for C11/C17. + # __STDC__ macro to determine whether it's safe to use const keyword prog_flex += '-DYY_USE_CONST=' prog_flex_cpp = prog_flex - if get_option('c_std') != 'c99' - # Convince win_flex to use for C++ files - prog_flex_cpp += '-D__STDC_VERSION__=199901' - endif + # Convince win_flex to use for C++ files + prog_flex_cpp += '-D__STDC_VERSION__=201112' prog_bison = find_program('win_bison', required : false) if not prog_bison.found()