Fix build for Python 3 on OS X #203
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timpalpant
force-pushed
the
fix-build-python3
branch
from
b07d4fa to
854191e
Compare
|
@timpalpant Could you rebase this on top of master and see if the CI likes that ? |
|
@timpalpant could you try to rebase whenever you have a second? |
|
Any thoughts why two of the windows builds are failing? |
NyanKiyoshi
reviewed
Mar 4, 2020
Comment on lines
+107
to
+117
| /* Seems that CPython 3.5.1 made our job harder. Did not find out how | ||
| to do that without these hacks. We can't use PyThreadState_GET(), | ||
| because that calls PyThreadState_Get() which fails an assert if the | ||
| result is NULL. */ | ||
| #if PY_MAJOR_VERSION >= 3 && !defined(_Py_atomic_load_relaxed) | ||
| /* this was abruptly un-defined in 3.5.1 */ | ||
| void *volatile _PyThreadState_Current; | ||
| /* XXX simple volatile access is assumed atomic */ | ||
| # define _Py_atomic_load_relaxed(pp) (*(pp)) | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Seems like it might be supposed to be inside vmprof_win.h instead of vmprof_win.c has it is used by _vmprof.c?
|
@mattip seems like master has the same issues, so just ignore it https://ci.appveyor.com/project/planrich/vmprof-python/builds/31240621 |
|
thanks, merged |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
vmprof_common.h gets included on OS X, resulting in multiple definitions of
_PyThreadState_Current. This definition is only needed invmprof_win.c, so move it there.I pip installed and ran pytest on the platforms I have available (OS X and Linux). Unfortunately, I don't have access to a Windows machine to test it.
Fixes #197 and #189