Bläddra i källkod

Work around lack of __thread storage qualifier on old macOS

(cherry picked from commit 245897bc311cde61aec7dc91c9c968745a03e968)
Carola Nitz 7 år sedan
förälder
incheckning
55a3f71289

+ 8 - 8
Resources/MobileVLCKit/patches/0012-Work-around-lack-of-__thread-storage-qualifier-on-ol.patch

@@ -1,6 +1,6 @@
-From 6bbac51e4456e9a126ee529a7e423da575c4482a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
-Date: Thu, 22 Feb 2018 14:20:21 +0100
+From 4579acfee3d2479e1c849c5124f539bbb831262b Mon Sep 17 00:00:00 2001
+From: Carola Nitz <nitz.carola@googlemail.com>
+Date: Fri, 23 Feb 2018 13:16:41 +0100
 Subject: [PATCH] Work around lack of __thread storage qualifier on old macOS
 
 ---
@@ -13,14 +13,14 @@ Subject: [PATCH] Work around lack of __thread storage qualifier on old macOS
  rename {compat => src/extras}/tdestroy.c (59%)
 
 diff --git a/configure.ac b/configure.ac
-index 5bf2a0366e..c5d7a41063 100644
+index 225bcae987..c5d7a41063 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -590,8 +590,8 @@ dnl Check for system libs needed
  need_libc=false
  
  dnl Check for usual libc functions
--AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
+-AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
 -AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
 +AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getpwuid_r isatty lstat memalign mkostemp mmap open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime tdestroy uselocale])
 +AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tfind timegm timespec_get strverscmp pathconf])
@@ -28,10 +28,10 @@ index 5bf2a0366e..c5d7a41063 100644
  AC_CHECK_FUNC(fdatasync,,
    [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
 diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
-index f1bcd06ce9..d6ad945f01 100644
+index 3003a154f6..ba4f6447be 100644
 --- a/include/vlc_fixups.h
 +++ b/include/vlc_fixups.h
-@@ -480,9 +480,12 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void
+@@ -486,9 +486,12 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void
  void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) );
  void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) );
  void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) );
@@ -203,5 +203,5 @@ index 6bb3480957..5c54881553 100644
 +
 +#endif
 -- 
-2.11.0
+2.14.3 (Apple Git-98)