Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tor
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jarl
tor
Commits
c80b7186
Commit
c80b7186
authored
8 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Plain Diff
Merge branch 'maint-0.2.9' into release-0.2.9
parents
863538ae
ef53526b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changes/bug20935
+3
-0
3 additions, 0 deletions
changes/bug20935
configure.ac
+3
-3
3 additions, 3 deletions
configure.ac
with
6 additions
and
3 deletions
changes/bug20935
0 → 100644
+
3
−
0
View file @
c80b7186
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.
This diff is collapsed.
Click to expand it.
configure.ac
+
3
−
3
View file @
c80b7186
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment