vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Mon Jun 15 13:45:32 2020 +0200| [37241405281820fc6dfc3a98cd90fcfb3ff56d3e] | committer: Steve Lhomme
contrib: pthreads: fix non inlined function in private builds All other INLINE functions in this file use the same signature. > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=37241405281820fc6dfc3a98cd90fcfb3ff56d3e --- contrib/src/pthreads/pthread-fix-inline.patch | 20 ++++++++++++++++++++ contrib/src/pthreads/rules.mak | 1 + 2 files changed, 21 insertions(+) diff --git a/contrib/src/pthreads/pthread-fix-inline.patch b/contrib/src/pthreads/pthread-fix-inline.patch new file mode 100644 index 0000000000..bacc572be6 --- /dev/null +++ b/contrib/src/pthreads/pthread-fix-inline.patch @@ -0,0 +1,20 @@ +--- pthreads/ptw32_MCS_lock.c.inline 2020-06-15 13:42:20.071125700 +0200 ++++ pthreads/ptw32_MCS_lock.c 2020-06-15 15:38:28.630658800 +0200 +@@ -99,7 +99,7 @@ + * Set event if an event handle has been stored in the flag, and + * set flag to -1 otherwise. Note that -1 cannot be a valid handle value. + */ +-INLINE void ++static INLINE void + ptw32_mcs_flag_set (HANDLE * flag) + { + HANDLE e = (HANDLE)(PTW32_INTERLOCKED_SIZE)PTW32_INTERLOCKED_COMPARE_EXCHANGE_SIZE( +@@ -119,7 +119,7 @@ ptw32_mcs_flag_set (HANDLE * flag) + * Store an event handle in the flag and wait on it if the flag has not been + * set, and proceed without creating an event otherwise. + */ +-INLINE void ++static INLINE void + ptw32_mcs_flag_wait (HANDLE * flag) + { + if ((PTW32_INTERLOCKED_LONG)0 == diff --git a/contrib/src/pthreads/rules.mak b/contrib/src/pthreads/rules.mak index fcc10916e4..872c975849 100644 --- a/contrib/src/pthreads/rules.mak +++ b/contrib/src/pthreads/rules.mak @@ -24,6 +24,7 @@ endif $(APPLY) $(SRC)/pthreads/x86-inline-asm.patch $(APPLY) $(SRC)/pthreads/arm64.patch $(APPLY) $(SRC)/pthreads/pthreads-fix-mode_t.patch + $(APPLY) $(SRC)/pthreads/pthread-fix-inline.patch $(MOVE) PTHREADS_W32_CONF := LFLAGS="$(LDFLAGS)" PTW32_FLAGS="$(CFLAGS)" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
