Mesa (main): glcpp: remove outdated msvc hack

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: ec9d7872acea97a5ec8aa9e525ff35ae1b2886c1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec9d7872acea97a5ec8aa9e525ff35ae1b2886c1

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Jun  7 16:46:20 2022 +0200

glcpp: remove outdated msvc hack

While MSVC doesn't do __STDC_VERSION__ correctly for C99, it does for
C11, which is what we now require. So we can remove this hack.

Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16908>

---

 src/compiler/glsl/glcpp/meson.build | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index 725ffe72440..cdf141b2bc0 100644
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -45,23 +45,13 @@ glcpp_lex = custom_target(
   command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@'],
 )
 
-_extra_args = []
-if cpp.get_id() == 'msvc'
-  # Flex relies on __STDC_VERSION__>=199901L to decide when to include C99
-  # inttypes.h.  We always have inttypes.h available with MSVC (either the one
-  # bundled with MSVC 2013, or the one we bundle ourselves), but we can't just
-  # define __STDC_VERSION__ without breaking stuff, as MSVC doesn't fully
-  # support C99.  There's also no way to premptively include stdint.
-  _extra_args += '-FIinttypes.h'
-endif
-
 libglcpp = static_library(
   'glcpp',
   [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')],
   dependencies : idep_mesautil,
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
-  c_args : [no_override_init_args, c_msvc_compat_args, _extra_args],
-  cpp_args : [cpp_msvc_compat_args, _extra_args],
+  c_args : [no_override_init_args, c_msvc_compat_args],
+  cpp_args : [cpp_msvc_compat_args],
   gnu_symbol_visibility : 'hidden',
   build_by_default : false,
 )
@@ -72,8 +62,8 @@ libglcpp_standalone = static_library(
   link_with : libglcpp,
   dependencies : idep_mesautil,
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
-  c_args : [no_override_init_args, c_msvc_compat_args, _extra_args],
-  cpp_args : [cpp_msvc_compat_args, _extra_args],
+  c_args : [no_override_init_args, c_msvc_compat_args],
+  cpp_args : [cpp_msvc_compat_args],
   gnu_symbol_visibility : 'hidden',
   build_by_default : false,
 )