diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 19:21:34 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 19:21:34 (GMT) |
| commit | 527a5cf1e6ce45960ee9b15c02b07dab9c4d0b41 (patch) | |
| tree | dc512eb95d1ec983c10f09eb976dc3491bb56277 /Modules | |
| parent | 611f8f5e8eb2742fd720dc0280e77b8d634639cb (diff) | |
| download | cpython-527a5cf1e6ce45960ee9b15c02b07dab9c4d0b41.zip cpython-527a5cf1e6ce45960ee9b15c02b07dab9c4d0b41.tar.gz cpython-527a5cf1e6ce45960ee9b15c02b07dab9c4d0b41.tar.bz2 | |
Merged revisions 83325,83328,83341 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r83325 | georg.brandl | 2010-07-31 11:37:03 +0200 (Sa, 31 Jul 2010) | 1 line
Copy Sun-specific inclusion of <alloca.h> from 2.7 maint to trunk; it seems to not have been merged to py3k.
........
r83328 | raymond.hettinger | 2010-07-31 12:14:41 +0200 (Sa, 31 Jul 2010) | 1 line
Document how to change OrderedDict update order from first to last.
........
r83341 | georg.brandl | 2010-07-31 13:40:07 +0200 (Sa, 31 Jul 2010) | 1 line
#9430: document timedelta str() and repr().
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ctypes/ctypes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h index e0bad07..0af5fa1 100644 --- a/Modules/_ctypes/ctypes.h +++ b/Modules/_ctypes/ctypes.h @@ -1,3 +1,7 @@ +#if defined (__SVR4) && defined (__sun) +# include <alloca.h> +#endif + #ifndef MS_WIN32 #define max(a, b) ((a) > (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b)) |