Skip to content

Commit

Permalink
include: remove restrict keyword (fixes #12354)
Browse files Browse the repository at this point in the history
This is necessary for compatibility with C++. The keyword is only
meaningful in definition, not in declaration anyway.
  • Loading branch information
Rémi Denis-Courmont committed Oct 7, 2014
1 parent eb1c092 commit 1a4dc0b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion include/vlc_es.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion include/vlc_probe.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions include/vlc_tls.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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 *);
};

Expand Down

0 comments on commit 1a4dc0b

Please sign in to comment.