X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgstmacros.h;h=b3313e4e37001084c1dc0276c5286220033fa804;hb=dc5a62f70234f729c0f3443ab725e9f0232cc1fe;hp=53cf6cf69e0addcfb0d3be5c5d649df6a6e1f51f;hpb=24e1abe367c702e366198beabbe5b760a3b9c12e;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/gst/gstmacros.h b/gst/gstmacros.h
index 53cf6cf..b3313e4 100644
--- a/gst/gstmacros.h
+++ b/gst/gstmacros.h
@@ -41,9 +41,12 @@ G_BEGIN_DECLS
 # undef GST_CAN_INLINE
 #endif
 
+/* MSVC defines 'restrict' as a keyword and not a define */
 #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