traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
........
This commit is contained in:
Benjamin Peterson 2010-06-27 23:49:45 +00:00
parent 19a1488428
commit e0edb8b3cd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/_ctypes/libffi/fficonfig.py.in
View File

@ -6,7 +6,7 @@ ffi_platforms = {
'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'], 'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'],
'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'], 'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'],
'X86': ['src/x86/ffi.c', 'src/x86/sysv.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'], 'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'],
'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'], 'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'],
'ALPHA': ['src/alpha/ffi.c', 'src/alpha/osf.S'], 'ALPHA': ['src/alpha/ffi.c', 'src/alpha/osf.S'],

2
Modules/selectmodule.c
View File

@ -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 */ fd2obj[0].obj = (PyObject*)0; /* set list to zero size */
FD_ZERO(set); 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) if (!fast_seq)
return -1; return -1;