gstmacros.h: Fix restrict definition on MSVC
authorNirbheek Chauhan <nirbheek@centricular.com>
Wed, 20 Feb 2019 12:21:40 +0000 (17:51 +0530)
committerNirbheek Chauhan <nirbheek@centricular.com>
Wed, 20 Feb 2019 12:21:40 +0000 (17:51 +0530)
Turns out it's exposed as `__restrict`, not as `restrict`.

https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/95#note_120782

gst/gstmacros.h

index 5c0815e..b3313e4 100644 (file)
@@ -42,9 +42,11 @@ G_BEGIN_DECLS
 #endif
 
 /* MSVC defines 'restrict' as a keyword and not a define */
-#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(_MSC_VER) && !defined(restrict)
+#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(restrict)
 #  if defined(__GNUC__) && __GNUC__ >= 4
 #    define restrict __restrict__
+#  elif defined(_MSC_VER)
+#    define restrict __restrict
 #  else
 #    define restrict
 #  endif