[vlc-commits] contrib: pthreads: remove useless patch

Steve Lhomme git at videolan.org
Wed May 16 15:53:28 CEST 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed May 16 12:28:04 2018 +0200| [d18abd95a86bbd6dcf7660251cce3886c08a4b73] | committer: Steve Lhomme

contrib: pthreads: remove useless patch

The code compiles fine without it, INLINE is properly defined

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

 contrib/src/pthreads/remove-inline.patch | 12 ------------
 contrib/src/pthreads/rules.mak           |  1 -
 2 files changed, 13 deletions(-)

diff --git a/contrib/src/pthreads/remove-inline.patch b/contrib/src/pthreads/remove-inline.patch
deleted file mode 100644
index ef21bde81c..0000000000
--- a/contrib/src/pthreads/remove-inline.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN pthreads-orig/ptw32_spinlock_check_need_init.c pthreads/ptw32_spinlock_check_need_init.c
---- pthreads-orig/ptw32_spinlock_check_need_init.c	2011-03-10 13:40:17.000000000 +0000
-+++ pthreads/ptw32_spinlock_check_need_init.c	2018-01-06 07:22:18.399696662 +0000
-@@ -38,7 +38,7 @@
- #include "implement.h"
- 
- 
--INLINE int
-+int
- ptw32_spinlock_check_need_init (pthread_spinlock_t * lock)
- {
-   int result = 0;
diff --git a/contrib/src/pthreads/rules.mak b/contrib/src/pthreads/rules.mak
index 8af5659bd9..1ba5377f4b 100644
--- a/contrib/src/pthreads/rules.mak
+++ b/contrib/src/pthreads/rules.mak
@@ -20,7 +20,6 @@ ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/pthreads/winrt.patch
 endif
 	$(APPLY) $(SRC)/pthreads/implib.patch
-	$(APPLY) $(SRC)/pthreads/remove-inline.patch
 	$(APPLY) $(SRC)/pthreads/x86-inline-asm.patch
 	$(APPLY) $(SRC)/pthreads/arm64.patch
 	$(APPLY) $(SRC)/pthreads/pthreads-fix-warning.patch



More information about the vlc-commits mailing list