Merge heads

928b9e27 · Serhiy Storchaka · 593568bf · 808d83d8 · 928b9e27 · 928b9e27
Commit 928b9e27 authored Dec 16, 2013 by Serhiy Storchaka
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Lib/test/test_devpoll.py Lib/test/test_devpoll.py +1 -0

Makefile.pre.in Makefile.pre.in +2 -1

No files found.
--- 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

--- 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)