1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

thread_pthread.c: unbreak 10.5 Intel by restoring accidentally deleted macro

Browse Source
This commit is contained in:
Sergey Fedorov 2023-11-01 16:53:46 +08:00 committed by Nobuyoshi Nakada
parent b77148ae9f
commit e3b4fe1b76
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
thread_pthread.c
View File

@ -2729,7 +2729,12 @@ native_thread_native_thread_id(rb_thread_t *target_th)
return INT2FIX(tid); return INT2FIX(tid);
#elif defined(__APPLE__) #elif defined(__APPLE__)
uint64_t tid; uint64_t tid;
# if ((MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6) || \ /* The first condition is needed because MAC_OS_X_VERSION_10_6
is not defined on 10.5, and while __POWERPC__ takes care of ppc/ppc64,
i386 will be broken without this. Note, 10.5 is supported with GCC upstream,
so it has C++17 and everything needed to build modern Ruby. */
# if (!defined(MAC_OS_X_VERSION_10_6) || \
(MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6) || \
defined(__POWERPC__) /* never defined for PowerPC platforms */) defined(__POWERPC__) /* never defined for PowerPC platforms */)
const bool no_pthread_threadid_np = true; const bool no_pthread_threadid_np = true;
# define NO_PTHREAD_MACH_THREAD_NP 1 # define NO_PTHREAD_MACH_THREAD_NP 1