Commit 468e0814 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

include: remove restrict keyword (fixes #12354)

This is necessary for compatibility with C++. The keyword is only
meaningful in definition, not in declaration anyway.

(cherry picked from commit 1a4dc0bd85d94c9ad0b50268aed009840bf2d30e)

Conflicts:
	include/vlc_tls.h
parent ef84c9c9
...@@ -285,7 +285,8 @@ VLC_API void video_format_ScaleCropAr( video_format_t *, const video_format_t * ...@@ -285,7 +285,8 @@ VLC_API void video_format_ScaleCropAr( video_format_t *, const video_format_t *
* This function "normalizes" the formats orientation, by switching the a/r according to the orientation, * This function "normalizes" the formats orientation, by switching the a/r according to the orientation,
* producing a format whose orientation is ORIENT_NORMAL. It makes a shallow copy (pallette is not alloc'ed). * producing a format whose orientation is ORIENT_NORMAL. It makes a shallow copy (pallette is not alloc'ed).
*/ */
VLC_API void video_format_ApplyRotation(video_format_t *restrict out, const video_format_t *restrict in); VLC_API void video_format_ApplyRotation(video_format_t * /*restrict*/ out,
const video_format_t *in);
/** /**
* This function applies the transform operation to fmt. * This function applies the transform operation to fmt.
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
extern "C" { extern "C" {
# endif # endif
void *vlc_probe (vlc_object_t *, const char *, size_t *restrict); void *vlc_probe (vlc_object_t *, const char *, size_t *);
#define vlc_probe(obj, cap, pcount) \ #define vlc_probe(obj, cap, pcount) \
vlc_probe(VLC_OBJECT(obj), cap, pcount) vlc_probe(VLC_OBJECT(obj), cap, pcount)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment