mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

- Test for sys/statvfs.h before including it, as statvfs is present

Browse source 
on some OSX installation, but its header file is not.
Will backport to 2.4
This commit is contained in:
Martin v. Löwis 2006-05-16 07:05:37 +00:00
parent 4ccc0b7dfe
commit 5f5d99c215
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/posixmodule.c
View file

@ -6518,7 +6518,7 @@ posix_WSTOPSIG(PyObject *self, PyObject *args)
#endif /* HAVE_SYS_WAIT_H */
#if defined(HAVE_FSTATVFS)
#if defined(HAVE_FSTATVFS) && defined(HAVE_SYS_STATVFS_H)
#ifdef _SCO_DS
/* SCO OpenServer 5.0 and later requires _SVID3 before it reveals the
needed definitions in sys/statvfs.h */
@ -6585,10 +6585,10 @@ posix_fstatvfs(PyObject *self, PyObject *args)
return _pystatvfs_fromstructstatvfs(st);
}
#endif /* HAVE_FSTATVFS */
#endif /* HAVE_FSTATVFS && HAVE_SYS_STATVFS_H */
#if defined(HAVE_STATVFS)
#if defined(HAVE_STATVFS) && defined(HAVE_SYS_STATVFS_H)
#include <sys/statvfs.h>
PyDoc_STRVAR(posix_statvfs__doc__,
@ -8126,10 +8126,10 @@ static PyMethodDef posix_methods[] = {
{"WSTOPSIG", posix_WSTOPSIG, METH_VARARGS, posix_WSTOPSIG__doc__},
#endif /* WSTOPSIG */
#endif /* HAVE_SYS_WAIT_H */
#ifdef HAVE_FSTATVFS
#if defined(HAVE_FSTATVFS) && defined(HAVE_SYS_STATVFS_H)
{"fstatvfs", posix_fstatvfs, METH_VARARGS, posix_fstatvfs__doc__},
#endif
#ifdef HAVE_STATVFS
#if defined(HAVE_STATVFS) && defined(HAVE_SYS_STATVFS_H)
{"statvfs", posix_statvfs, METH_VARARGS, posix_statvfs__doc__},
#endif
#ifdef HAVE_TMPFILE