sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2016-12-11 22:22:35 -05:00
parent 863538ae4f ef53526b10
commit c80b7186bc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug20935 Normal file
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.

6
configure.ac
View File

@ -430,11 +430,11 @@ AC_MSG_CHECKING([for a pre-Sierra OSX build target])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#ifdef __APPLE__ #ifdef __APPLE__
# include <AvailabilityMacros.h> # include <AvailabilityMacros.h>
# ifndef MAC_OS_VERSION_10_12 # ifndef MAC_OS_X_VERSION_10_12
# define MAC_OS_VERSION_10_12 101200 # define MAC_OS_X_VERSION_10_12 101200
# endif # endif
# if defined(MAC_OS_X_VERSION_MIN_REQUIRED) # 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" # error "Running on Mac OSX 10.11 or earlier"
# endif # endif
# endif # endif