diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-06-27 23:49:45 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-06-27 23:49:45 (GMT) |
| commit | e0edb8b3cdfb4107173077a3188c1def2e594b37 (patch) | |
| tree | 9293f94f469c83cb6427703e87761d5dba56f786 | |
| parent | 19a14884285d6d29db16ddbe2f70ed357520f032 (diff) | |
| download | cpython-e0edb8b3cdfb4107173077a3188c1def2e594b37.zip cpython-e0edb8b3cdfb4107173077a3188c1def2e594b37.tar.gz cpython-e0edb8b3cdfb4107173077a3188c1def2e594b37.tar.bz2 | |
Merged revisions 79894-79895,80098,80120 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79894 | jeroen.ruigrok | 2010-04-07 09:33:37 -0500 (Wed, 07 Apr 2010) | 5 lines
FreeBSD is not a sysv platform, so use freebsd.S instead of sysv.S (as is
also the case in FreeBSD's port of libffi).
Reviewed by: dickinsm
........
r79895 | jeroen.ruigrok | 2010-04-07 11:34:08 -0500 (Wed, 07 Apr 2010) | 2 lines
Document the libffi FreeBSD fix.
........
r80098 | benjamin.peterson | 2010-04-15 16:42:16 -0500 (Thu, 15 Apr 2010) | 1 line
add space
........
r80120 | antoine.pitrou | 2010-04-16 16:34:02 -0500 (Fri, 16 Apr 2010) | 3 lines
Ignore jinja2
........
| -rw-r--r-- | Modules/_ctypes/libffi/fficonfig.py.in | 2 | ||||
| -rw-r--r-- | Modules/selectmodule.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in index 045d7c3..b7bae9c 100644 --- a/Modules/_ctypes/libffi/fficonfig.py.in +++ b/Modules/_ctypes/libffi/fficonfig.py.in @@ -6,7 +6,7 @@ ffi_platforms = { 'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'], 'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'], 'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'], - 'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/sysv.S'], + 'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/freebsd.S'], 'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'], 'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'], 'ALPHA': ['src/alpha/ffi.c', 'src/alpha/osf.S'], diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index f334153..7de7be9 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -91,7 +91,7 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1]) fd2obj[0].obj = (PyObject*)0; /* set list to zero size */ FD_ZERO(set); - fast_seq=PySequence_Fast(seq, "arguments 1-3 must be sequences"); + fast_seq = PySequence_Fast(seq, "arguments 1-3 must be sequences"); if (!fast_seq) return -1; |