[vlc-commits] include: remove restrict keyword (fixes #12354)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct  7 23:16:11 2014 +0300| [1a4dc0bd85d94c9ad0b50268aed009840bf2d30e] | 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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1a4dc0bd85d94c9ad0b50268aed009840bf2d30e
---

 include/vlc_es.h    |    3 ++-
 include/vlc_probe.h |    2 +-
 include/vlc_tls.h   |    4 ++--
 3 files changed, 5 insertions(+), 4 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)
 
diff --git a/include/vlc_tls.h b/include/vlc_tls.h
index 5bfd418..8b55ee8 100644
--- a/include/vlc_tls.h
+++ b/include/vlc_tls.h
@@ -48,7 +48,7 @@ VLC_API vlc_tls_t *vlc_tls_ClientSessionCreate (vlc_tls_creds_t *, int fd,
 vlc_tls_t *vlc_tls_SessionCreate (vlc_tls_creds_t *, int fd, const char *host,
                                   const char *const *alpn);
 int vlc_tls_SessionHandshake (vlc_tls_t *, const char *host, const char *serv,
-                              char **restrict alp);
+                              char ** /*restrict*/ alp);
 VLC_API void vlc_tls_SessionDelete (vlc_tls_t *);
 
 /* NOTE: It is assumed that a->sock.p_sys = a */
@@ -68,7 +68,7 @@ struct vlc_tls_creds
     int (*open) (vlc_tls_creds_t *, vlc_tls_t *, int fd, const char *host,
                  const char *const *alpn);
     int  (*handshake) (vlc_tls_t *, const char *host, const char *service,
-                       char **restrict alp);
+                       char ** /*restrict*/ alp);
     void (*close) (vlc_tls_t *);
 };