summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2002-10-20 22:11:13 +0000
committerrwatson <rwatson@FreeBSD.org>2002-10-20 22:11:13 +0000
commitd862ecfee8a2ae2fa2c34cbf7f45762df54e50c4 (patch)
tree969ed83b4bf9a4fe7660c27e0c557283216b922e
parent438835cabb95a758042ff249cbd5840727eaf9bd (diff)
downloadFreeBSD-src-d862ecfee8a2ae2fa2c34cbf7f45762df54e50c4.zip
FreeBSD-src-d862ecfee8a2ae2fa2c34cbf7f45762df54e50c4.tar.gz
Rename _POSIX_FOO_PRESENT and friends from POSIX.1e to _PC_FOO_PRESENT
and related friends. This would have been corrected had POSIX.1e progressed to a standard. Pointed out by: wollman
-rw-r--r--sys/sys/unistd.h11
-rw-r--r--sys/ufs/ufs/ufs_vnops.c6
2 files changed, 8 insertions, 9 deletions
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index bf2037c..2a84c83 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -143,12 +143,11 @@
#endif
#if __BSD_VISIBLE
-/* XXX: These symbols are in the WRONG namespace (should be _PC_*). */
-#define _POSIX_ACL_EXTENDED 59
-#define _POSIX_ACL_PATH_MAX 60
-#define _POSIX_CAP_PRESENT 61
-#define _POSIX_INF_PRESENT 62
-#define _POSIX_MAC_PRESENT 63
+#define _PC_ACL_EXTENDED 59
+#define _PC_ACL_PATH_MAX 60
+#define _PC_CAP_PRESENT 61
+#define _PC_INF_PRESENT 62
+#define _PC_MAC_PRESENT 63
#endif
#if __BSD_VISIBLE
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 739ec66..ba6edd2 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -2188,7 +2188,7 @@ ufs_pathconf(ap)
case _PC_NO_TRUNC:
*ap->a_retval = 1;
return (0);
- case _POSIX_ACL_EXTENDED:
+ case _PC_ACL_EXTENDED:
#ifdef UFS_ACL
if (ap->a_vp->v_mount->mnt_flag & MNT_ACLS)
*ap->a_retval = 1;
@@ -2198,7 +2198,7 @@ ufs_pathconf(ap)
*ap->a_retval = 0;
#endif
return (0);
- case _POSIX_ACL_PATH_MAX:
+ case _PC_ACL_PATH_MAX:
#ifdef UFS_ACL
if (ap->a_vp->v_mount->mnt_flag & MNT_ACLS)
*ap->a_retval = ACL_MAX_ENTRIES;
@@ -2208,7 +2208,7 @@ ufs_pathconf(ap)
*ap->a_retval = 3;
#endif
return (0);
- case _POSIX_MAC_PRESENT:
+ case _PC_MAC_PRESENT:
#ifdef MAC
if (ap->a_vp->v_mount->mnt_flag & MNT_MULTILABEL)
*ap->a_retval = 1;
OpenPOWER on IntegriCloud