vlc | branch: master | Hugo Beauzée-Luyssen <h...@beauzee.fr> | Tue Aug 21 16:34:35 2018 +0200| [a4afabc2d275429aa59f7695c89d407859315563] | committer: Hugo Beauzée-Luyssen
libvlc: Fix EnumClockSource prototype vlc_string_list_cb is expected to return an int > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a4afabc2d275429aa59f7695c89d407859315563 --- src/libvlc.h | 2 +- src/win32/thread.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvlc.h b/src/libvlc.h index 6c0381122b..97faa1d4d8 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -39,7 +39,7 @@ void system_Configure ( libvlc_int_t *, int, const char *const [] ); #if defined(_WIN32) || defined(__OS2__) void system_End(void); #ifndef __OS2__ -size_t EnumClockSource( const char *, char ***, char *** ); +int EnumClockSource( const char *, char ***, char *** ); #endif #endif void vlc_CPU_dump(vlc_object_t *); diff --git a/src/win32/thread.c b/src/win32/thread.c index b4bfaeb585..bd1bc22e26 100644 --- a/src/win32/thread.c +++ b/src/win32/thread.c @@ -877,12 +877,12 @@ static BOOL SelectClockSource(void *data) return TRUE; } -size_t EnumClockSource(const char *var, char ***vp, char ***np) +int EnumClockSource(const char *var, char ***vp, char ***np) { const size_t max = 6; char **values = xmalloc (sizeof (*values) * max); char **names = xmalloc (sizeof (*names) * max); - size_t n = 0; + int n = 0; values[n] = xstrdup (""); names[n] = xstrdup (_("Auto")); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits