vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Oct
7 23:16:11 2014 +0300| [468e08143053c5705f5fed18c9ad2cfc4c58ec0d] | committer:
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
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=468e08143053c5705f5fed18c9ad2cfc4c58ec0d
---
include/vlc_es.h | 3 ++-
include/vlc_probe.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/vlc_es.h b/include/vlc_es.h
index 5790d23..8db5884 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -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,
* 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.
diff --git a/include/vlc_probe.h b/include/vlc_probe.h
index 9931504..efa4d97 100644
--- a/include/vlc_probe.h
+++ b/include/vlc_probe.h
@@ -32,7 +32,7 @@
extern "C" {
# 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) \
vlc_probe(VLC_OBJECT(obj), cap, pcount)
_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
