Skip to content

Commit c894ef6

Browse files
committed
Remove code for pre OS X 10.5
1 parent 0346206 commit c894ef6

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ AS_CASE(["$target_os"],
402402
[darwin*], [
403403
AC_MSG_CHECKING(if minimum required OS X version is supported)
404404
AC_PREPROC_IFELSE([AC_LANG_SOURCE([[@%:@include <AvailabilityMacros.h>
405-
@%:@if MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_5
405+
@%:@if !defined(MAC_OS_X_VERSION_10_5) || \
406+
(MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
406407
@%:@error pre OS X 10.5
407408
[!<===== pre OS X 10.5 =====>]
408409
@%:@endif

file.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
# define API_DEPRECATED(...)
3939
# endif
4040
# include <CoreFoundation/CFString.h>
41+
# if !defined(MAC_OS_X_VERSION_10_5) || \
42+
(MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
43+
# error Unsupported OS version required
44+
# endif
4145
#endif
4246

4347
#ifdef HAVE_UNISTD_H

signal.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -816,11 +816,7 @@ check_stack_overflow(int sig, const uintptr_t addr, const ucontext_t *ctx)
816816
# endif
817817
# elif defined __APPLE__
818818
# include <AvailabilityMacros.h>
819-
# if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
820-
# define MCTX_SS_REG(reg) __ss.__##reg
821-
# else
822-
# define MCTX_SS_REG(reg) ss.reg
823-
# endif
819+
# define MCTX_SS_REG(reg) __ss.__##reg /* OS X 10.5 or later */
824820
# if defined(__LP64__)
825821
const uintptr_t sp = mctx->MCTX_SS_REG(rsp);
826822
const uintptr_t bp = mctx->MCTX_SS_REG(rbp);

thread_pthread.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242

4343
#if defined __APPLE__
4444
# include <AvailabilityMacros.h>
45+
# if !defined(MAC_OS_X_VERSION_10_5) || \
46+
(MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
47+
# error Unsupported OS version required
48+
# endif
4549
#endif
4650

4751
#if defined(HAVE_SYS_EVENTFD_H) && defined(HAVE_EVENTFD)

vm_dump.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -751,11 +751,7 @@ rb_vmdebug_thread_dump_state(FILE *errout, VALUE self)
751751

752752
#if defined __APPLE__
753753
# include <AvailabilityMacros.h>
754-
# if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
755-
# define MCTX_SS_REG(reg) __ss.__##reg
756-
# else
757-
# define MCTX_SS_REG(reg) ss.reg
758-
# endif
754+
# define MCTX_SS_REG(reg) __ss.__##reg /* OS X 10.5 or later */
759755
#endif
760756

761757
#if defined(HAVE_BACKTRACE)

0 commit comments

Comments
 (0)