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

bpo-30854: Fix compile error when --without-threads #2581

Merged

Conversation

ma8ma
Copy link
Contributor

@ma8ma ma8ma commented Jul 5, 2017

I found a syntax error when compiling without threads. In that place, the colon has been used instead of semicolon at end of statement. I open one line change PR that replaces colon with semicolon for master branch.

related changeset:

https://bugs.python.org/issue30854

@@ -0,0 +1 @@
Fix compile error when --without-threads
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • [...] when compiling [...]
  • Add a full-stop after --without-threads
  • Please add "Patch by Masayuki Yamamoto."

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done 👍

@vstinner vstinner merged commit 0c31163 into python:master Jul 5, 2017
@vstinner
Copy link
Member

vstinner commented Jul 5, 2017

I tested manually:

make distclean
./configure --without-threads && make  # fail
git pr 2581 && make # success

I confirm that this PR fixes a compilation error. I merged your PR, thanks.

ma8ma added a commit to ma8ma/cpython that referenced this pull request Jul 5, 2017
)

* bpo-30854: Fix compile error when --without-threads

* bpo-30854: fix news
(cherry picked from commit 0c31163)
@bedevere-bot
Copy link

GH-2583 is a backport of this pull request to the 3.6 branch.

vstinner pushed a commit that referenced this pull request Jul 5, 2017
…2583)

* bpo-30854: Fix compile error when --without-threads

* bpo-30854: fix news
(cherry picked from commit 0c31163)
@ma8ma ma8ma deleted the bpo-30854-fix-compile-error-when-without-threads branch July 5, 2017 11:31
vstinner added a commit that referenced this pull request Jul 5, 2017
vstinner added a commit that referenced this pull request Jul 5, 2017
* Revert "bpo-30854: Fix compile error when --without-threads (#2581)"

This reverts commit 0c31163.

* Revert "NEWS for 30777 (#2576)"

This reverts commit aaa917f.

* Revert "bpo-21624: IDLE -- minor htest fixes (#2575)"

This reverts commit 2000150.

* Revert "bpo-30777: IDLE: configdialog - add docstrings and improve comments (#2440)"

This reverts commit 7eb5883.

* Revert "bpo-30319: socket.close() now ignores ECONNRESET (#2565)"

This reverts commit 67e1478.

* Revert "bpo-30789: Use a single memory block for co_extra. (#2555)"

This reverts commit 378ebb6.

* Revert "bpo-30845: Enhance test_concurrent_futures cleanup (#2564)"

This reverts commit 3df9dec.

* Revert "bpo-29293: multiprocessing.Condition.notify() lacks parameter `n` (#2480)"

This reverts commit 4835041.

* Revert "Remove outdated FOX from GUI FAQ (GH-2538)"

This reverts commit d3ed287.

* Revert "bpo-6691: Pyclbr now reports nested classes and functions. (#2503)"

This reverts commit 246ff3b.

* Revert "bpo-29464: Rename METH_FASTCALL to METH_FASTCALL|METH_KEYWORDS and make (#1955)"

This reverts commit 6969eaf.

* Revert "bpo-30832: Remove own implementation for thread-local storage (#2537)"

This reverts commit aa0aa04.

* Revert "bpo-30764: Fix regrtest --fail-env-changed --forever (#2536)"

This reverts commit 5e87592.

* Revert "bpo-30822: Deduplicate ZoneInfoTest classes in test_datetime. (#2534)"

This reverts commit 34b5487.

* Revert "bpo-30822: Fix testing of datetime module. (#2530)"

This reverts commit 98b6bc3.
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.

5 participants