diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-12-16 13:16:35 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-12-16 13:16:35 (GMT) |
| commit | 928b9e272dae8c0740732a1c01f1bff72ded5ad5 (patch) | |
| tree | bd45b7f677066186d844c925b8cb98c3ca8befef | |
| parent | 593568bf47600154b760edf21f22090ff60a2a74 (diff) | |
| parent | 808d83d8fdde6bd5d3a0da2302826c69e40fba61 (diff) | |
| download | cpython-928b9e272dae8c0740732a1c01f1bff72ded5ad5.zip cpython-928b9e272dae8c0740732a1c01f1bff72ded5ad5.tar.gz cpython-928b9e272dae8c0740732a1c01f1bff72ded5ad5.tar.bz2 | |
Merge heads
| -rw-r--r-- | Lib/test/test_devpoll.py | 1 | ||||
| -rw-r--r-- | Makefile.pre.in | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py index c7bacf8..819d9dc 100644 --- a/Lib/test/test_devpoll.py +++ b/Lib/test/test_devpoll.py @@ -4,6 +4,7 @@ import os, select, random, unittest, sys from test.support import TESTFN, run_unittest +from _testcapi import USHRT_MAX try: select.devpoll diff --git a/Makefile.pre.in b/Makefile.pre.in index a6aa975..e97b07b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -848,7 +848,8 @@ PYTHON_HEADERS= \ $(srcdir)/Include/warnings.h \ $(srcdir)/Include/weakrefobject.h \ pyconfig.h \ - $(PARSER_HEADERS) + $(PARSER_HEADERS) \ + $(AST_H) $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS) |