[tor-commits] [tor/maint-0.2.9] Spell MAC_OS_X_VERSION_10_12 correctly.

nickm at torproject.org nickm at torproject.org
Mon Dec 12 03:25:04 UTC 2016


commit ef53526b104675cadb0e52dd3d9d407d1d027073
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Dec 11 22:17:14 2016 -0500

    Spell MAC_OS_X_VERSION_10_12 correctly.
    
    Fixes 20935.
---
 changes/bug20935 | 3 +++
 configure.ac     | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/changes/bug20935 b/changes/bug20935
new file mode 100644
index 0000000..78068c7
--- /dev/null
+++ b/changes/bug20935
@@ -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.
diff --git a/configure.ac b/configure.ac
index df68ffa..699eafc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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



More information about the tor-commits mailing list