mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Use xattr functions from sys/xattr.h instead of attr/xattr.h (closes #12720)

Browse source 
sys/xattr.h is glibc while attr/xattr.h is a separate library.
This commit is contained in:
Benjamin Peterson 2011-09-13 17:20:47 -04:00
parent 3ac4f59a82
commit b77fe17320
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/posixmodule.c
View file

@ -107,8 +107,8 @@ corresponding Unix manual entries for more information on calls.");
#include <sched.h>
#endif
#ifdef HAVE_ATTR_XATTR_H
#include <attr/xattr.h>
#ifdef HAVE_SYS_XATTR_H
#include <sys/xattr.h>
#endif
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__)
@ -10032,7 +10032,7 @@ posix_mkfifoat(PyObject *self, PyObject *args)
}
#endif
#ifdef HAVE_ATTR_XATTR_H
#ifdef HAVE_SYS_XATTR_H
static int
try_getxattr(const char *path, const char *name,
@ -10408,7 +10408,7 @@ posix_flistxattr(PyObject *self, PyObject *args)
return listxattr_common((const char *)(Py_uintptr_t)fd, wrap_flistxattr);
}
#endif /* HAVE_ATTR_XATTR_H */
#endif /* HAVE_SYS_XATTR_H */
static PyMethodDef posix_methods[] = {
{"access", posix_access, METH_VARARGS, posix_access__doc__},
@ -10861,7 +10861,7 @@ static PyMethodDef posix_methods[] = {
#ifdef HAVE_MKFIFOAT
{"mkfifoat", posix_mkfifoat, METH_VARARGS, posix_mkfifoat__doc__},
#endif
#ifdef HAVE_ATTR_XATTR_H
#ifdef HAVE_SYS_XATTR_H
{"setxattr", posix_setxattr, METH_VARARGS, posix_setxattr__doc__},
{"lsetxattr", posix_lsetxattr, METH_VARARGS, posix_lsetxattr__doc__},
{"fsetxattr", posix_fsetxattr, METH_VARARGS, posix_fsetxattr__doc__},
@ -11336,7 +11336,7 @@ all_ins(PyObject *d)
#endif
#endif
#ifdef HAVE_ATTR_XATTR_H
#ifdef HAVE_SYS_XATTR_H
if (ins(d, "XATTR_CREATE", (long)XATTR_CREATE)) return -1;
if (ins(d, "XATTR_REPLACE", (long)XATTR_REPLACE)) return -1;
if (ins(d, "XATTR_SIZE_MAX", (long)XATTR_SIZE_MAX)) return -1;