8000 properly detect MacOS by jsteemann · Pull Request #14771 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

properly detect MacOS #14771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 15, 2021
Merged

properly detect MacOS #14771

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef84a0f
properly detect MacOS
jsteemann Sep 13, 2021
06a62eb
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/pri…
jsteemann Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
properly detect MacOS
  • Loading branch information
@jsteemann
jsteemann committed Sep 13, 2021
commit ef84a0ff12d118593e8017f2f27c03784edb33ab
2 changes: 1 addition & 1 deletion arangod/RestServer/EnvironmentFeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ void EnvironmentFeature::prepare() {
#elif _WIN32
// TODO: improve Windows version detection
_operatingSystem = "windows";
#elif __apple__
#elif __APPLE__
// TODO: improve MacOS version detection
_operatingSystem = "macos";
#else
Expand Down
0