openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-11-23 07:19:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

meson: modernize win_flex stdint.h logic

Browse Source 
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 <jenatali@microsoft.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16812>
This commit is contained in:
Erik Faye-Lund 2022-06-01 13:14:27 +02:00 committed by Marge Bot
parent a8605db504
commit 8575d0e84b
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@ -1916,22 +1916,16 @@ if build_machine.system() == 'windows'
# windows compatibility (uses <io.h> instead of <unistd.h> 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 <inttypes.h> for C++ files
prog_flex_cpp += '-D__STDC_VERSION__=199901'
endif
# Convince win_flex to use <inttypes.h> for C++ files
prog_flex_cpp += '-D__STDC_VERSION__=201112'
prog_bison = find_program('win_bison', required : false)
if not prog_bison.found()