torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9'

Browse Source
This commit is contained in:
Nick Mathewson
2016-12-11 22:23:31 -05:00
parent 14edb0bd0c ef53526b10
commit cbdb3c92f5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug20935
+3
View File
@@ -0,0 +1,3 @@
o Minor bugfixes (portability):
- Use the correct spelling of MAC_OS_X_VERSION_10_12 on configure.ac
Fixes bug 20935; bugfix on 0.2.9.6-rc.
configure.ac
+3 -3
View File
@@ -430,11 +430,11 @@ AC_MSG_CHECKING([for a pre-Sierra OSX build target])
AC_TRY_COMPILE([
#ifdef __APPLE__
# include <AvailabilityMacros.h>
# ifndef MAC_OS_VERSION_10_12
# define MAC_OS_VERSION_10_12 101200
# ifndef MAC_OS_X_VERSION_10_12
# define MAC_OS_X_VERSION_10_12 101200
# endif
# if defined(MAC_OS_X_VERSION_MIN_REQUIRED)
# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_10_12
# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12
# error "Running on Mac OSX 10.11 or earlier"
# endif
# endif