diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-03-21 22:36:19 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-03-21 22:36:19 (GMT) |
| commit | 2614cda20910e1b2529d5af4a95327f8cdfcc35a (patch) | |
| tree | 4a2d95569150aa2b6f81eb8ea921eac67afa2bf8 /Modules/signalmodule.c | |
| parent | b5023a1433c4afbf2460a6433593769d1d99bee5 (diff) | |
| download | cpython-2614cda20910e1b2529d5af4a95327f8cdfcc35a.zip cpython-2614cda20910e1b2529d5af4a95327f8cdfcc35a.tar.gz cpython-2614cda20910e1b2529d5af4a95327f8cdfcc35a.tar.bz2 | |
Merged revisions 78338,78345-78346,78561-78562,78566,78574,78581,78634,78660,78675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78338 | andrew.kuchling | 2010-02-22 15:04:02 -0600 (Mon, 22 Feb 2010) | 4 lines
Remove Tools/modulator, a reference to it in the docs, and a screenshot of it.
(I asked the BDFL first, and he approved removing it. The last actual bugfix
to Tools/modulator was in 2001; since then all changes have been search-and-replace:
string methods, whitespace fixes, etc.)
........
r78345 | andrew.kuchling | 2010-02-22 17:10:52 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: DONT_HAVE_ERRNO_H is no longer defined by configure (after rev.46819).
........
r78346 | andrew.kuchling | 2010-02-22 17:12:00 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: add include guards where they're missing; required for Windows CE
........
r78561 | andrew.kuchling | 2010-03-01 13:51:43 -0600 (Mon, 01 Mar 2010) | 1 line
#7191: describe more details of wbits parameter
........
r78562 | andrew.kuchling | 2010-03-01 14:11:57 -0600 (Mon, 01 Mar 2010) | 1 line
#7637: avoid repeated-concatenation antipattern in example
........
r78566 | barry.warsaw | 2010-03-01 15:46:51 -0600 (Mon, 01 Mar 2010) | 4 lines
Manually copy patch for bug 7250 from the release26-maint branch. I suck
because I did this in the wrong order and couldn't smack svnmerge into
submission.
........
r78574 | benjamin.peterson | 2010-03-01 17:25:13 -0600 (Mon, 01 Mar 2010) | 1 line
remove CVS id
........
r78581 | michael.foord | 2010-03-02 08:22:15 -0600 (Tue, 02 Mar 2010) | 1 line
Link correction in documentation.
........
r78634 | benjamin.peterson | 2010-03-03 15:28:25 -0600 (Wed, 03 Mar 2010) | 1 line
rephrase
........
r78660 | dirkjan.ochtman | 2010-03-04 13:21:53 -0600 (Thu, 04 Mar 2010) | 4 lines
Try to fix buildbot breakage from r78384.
Thanks bitdancer and briancurtin for the help.
........
r78675 | florent.xicluna | 2010-03-04 19:12:14 -0600 (Thu, 04 Mar 2010) | 2 lines
These line should not be there.
........
Diffstat (limited to 'Modules/signalmodule.c')
| -rw-r--r-- | Modules/signalmodule.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 5d053f0..13806c7 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -7,12 +7,17 @@ #include "intrcheck.h" #ifdef MS_WINDOWS +#ifdef HAVE_PROCESS_H #include <process.h> #endif +#endif +#ifdef HAVE_SIGNAL_H #include <signal.h> - +#endif +#ifdef HAVE_SYS_STAT_H #include <sys/stat.h> +#endif #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif |