From ea4b0861425d8e92e73164847d25f6381b39283a Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 20 Feb 2019 01:25:11 +0530 Subject: [PATCH] gstmacros.h: Fix check for 'restrict' keyword MSVC also defines it as a keyword. Fixes build errors in projects that include MSVC's xkeycheck.h which ensures that keywords aren't overriden with a define. --- gst/gstmacros.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gst/gstmacros.h b/gst/gstmacros.h index 53cf6cf69e..5c0815e713 100644 --- a/gst/gstmacros.h +++ b/gst/gstmacros.h @@ -41,7 +41,8 @@ G_BEGIN_DECLS # undef GST_CAN_INLINE #endif -#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(restrict) +/* MSVC defines 'restrict' as a keyword and not a define */ +#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(_MSC_VER) && !defined(restrict) # if defined(__GNUC__) && __GNUC__ >= 4 # define restrict __restrict__ # else