diff options
| author | Larry Hastings <larry@hastings.org> | 2016-06-26 19:43:00 -0700 |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2016-06-26 19:43:00 -0700 |
| commit | 91058707cfd95f65f844f74a7f8e7c208e53bc22 (patch) | |
| tree | 5d247b8a80d6f43ce204f8e68db729033f6e756d | |
| parent | ea684921c2b829f112f7f55d811ca840a461eb3b (diff) | |
| parent | 4b9e75ba7f5d2f0baf0603eed9b4029af8e82ff3 (diff) | |
| download | cpython-git-91058707cfd95f65f844f74a7f8e7c208e53bc22.tar.gz | |
Merge.
| -rw-r--r-- | Doc/Makefile | 8 | ||||
| -rw-r--r-- | Modules/expat/xmlrole.c | 4 | ||||
| -rw-r--r-- | Modules/expat/xmltok.c | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index ea3023157d..2220d92d91 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -161,7 +161,7 @@ autobuild-dev: -make suspicious # for quick rebuilds (HTML only) -autobuild-html: +autobuild-dev-html: make html SPHINXOPTS='-A daily=1 -A versionswitcher=1' # for stable releases: only build if not in pre-release stage (alpha, beta) @@ -173,3 +173,9 @@ autobuild-stable: esac @make autobuild-dev +autobuild-stable-html: + @case $(DISTVERSION) in *[ab]*) \ + echo "Not building; $(DISTVERSION) is not a release version."; \ + exit 1;; \ + esac + @make autobuild-dev-html diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c index 9a8f85dd25..44772e21dd 100644 --- a/Modules/expat/xmlrole.c +++ b/Modules/expat/xmlrole.c @@ -2,6 +2,8 @@ See the file COPYING for copying permission. */ +#include <stddef.h> + #ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) @@ -16,8 +18,6 @@ #endif #endif /* ndef COMPILED_FROM_DSP */ -#include <stddef.h> - #include "expat_external.h" #include "internal.h" #include "xmlrole.h" diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c index 205c07eb84..bf09dfc72b 100644 --- a/Modules/expat/xmltok.c +++ b/Modules/expat/xmltok.c @@ -2,6 +2,8 @@ See the file COPYING for copying permission. */ +#include <stddef.h> + #ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) @@ -16,8 +18,6 @@ #endif #endif /* ndef COMPILED_FROM_DSP */ -#include <stddef.h> - #include "expat_external.h" #include "internal.h" #include "xmltok.h" |