From ccb5cf8b4b6afbd2b8ff00d0a2cab23ea49e0125 Mon Sep 17 00:00:00 2001
From: Jesse Natalie <jenatali@microsoft.com>
Date: Sun, 8 Aug 2021 08:45:34 -0700
Subject: [PATCH] meson: Set /Zc:__cplusplus for MSVC

Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12881>
---
 meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meson.build b/meson.build
index ac343b6b018..c2a8dc30576 100644
--- a/meson.build
+++ b/meson.build
@@ -1081,6 +1081,7 @@ if cc.get_id() == 'msvc'
                '/wd5105',  # macro expansion producing 'defined' has undefined behavior (winbase.h, need Windows SDK upgrade)
                '/we4020',  # Error when passing the wrong number of parameters
                '/we4024',  # Error when passing different type of parameter
+               '/Zc:__cplusplus', #Set __cplusplus macro to match the /std:c++<version> on the command line
               ]
     if cc.has_argument(a)
       c_args += a