Skip to content
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.

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

Fix Mac OS X Sierra introduce clock_gettime #115

Merged
merged 1 commit into from
Aug 9, 2017

Conversation

rickyzhang82
Copy link
Contributor

@rickyzhang82 rickyzhang82 commented Aug 7, 2017

Mac OS X Sierra introduce clock_gettime. This breaks HAVE_CLOCK_TIME macro and corresponding get time logic. Because now Sierra has its clock_gettime function while the earlier Mac don't.

The simple fix that won't break Mac OS X earlier than Sierra is to move HAVE_CLCOK_GETTIME down and let Mac OS X condition check up. In this case, the old way is always used regardless of the existence of clock_gettime in different Mac OS X.

I tested it on Sierra and Linux. It works. In theory, it should also work for earlier Mac OS X.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
@asvitkine asvitkine merged commit 8d1532c into cebix:master Aug 9, 2017
asvitkine added a commit that referenced this pull request Aug 9, 2017
This reverts commit 35ca220.

Going with #115 instead.
@rickyzhang82
Copy link
Contributor Author

Thanks!

@rickyzhang82 rickyzhang82 deleted the pr-sierra-clock-gettime branch August 9, 2017 11:40
ianfixes pushed a commit to emaculation/macemu that referenced this pull request Mar 1, 2019
This reverts commit 35ca220.

Going with cebix/macemu#115 instead.
rakslice pushed a commit to rakslice/macemu that referenced this pull request Oct 16, 2020
Fix Mac OS X Sierra introduce clock_gettime
rakslice pushed a commit to rakslice/macemu that referenced this pull request Oct 16, 2020
This reverts commit 35ca220.

Going with cebix#115 instead.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants