nosuid getmntent() branch.

p4raw-id: //depot/cfgperl@2679

diff --git a/perl.c b/perl.c
index 25111ad..c91c960 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -2148,7 +2148,7 @@ fd_on_nosuid_fs(int fd)
     on_nosuid  = check_okay && (stfs.f_flags & PERL_MOUNT_NOSUID);
 #           endif
 #       else
-#           if defined(HAS_GETMNENT) && defined(HAS_HASMNTOPT) && defined(MNTOPT_NOSUID)
+#           if defined(HAS_GETMNTENT) && defined(HAS_HASMNTOPT) && defined(MNTOPT_NOSUID)
     FILE               *mtab = fopen("/etc/mtab", "r");
     struct mntent      *entry;
     struct stat                stb, fsb;

diff --git a/perl.h b/perl.h
index 9dd71e5..c7e328a 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -2783,15 +2783,13 @@ typedef struct am_table_short AMTS;
 #ifdef IAMSUID
 
 #ifdef I_SYS_STATVFS
-#   include <sys/statvfs.h>
-#else
-#   ifdef I_SYS_MOUNT
-#       include <sys/mount.h>
-#   else
-#       ifdef I_MNTENT
-#           include <mntent.h>
-#       endif
-#   endif
+#   include <sys/statvfs.h>     /* for f?statvfs() */
+#endif
+#ifdef I_SYS_MOUNT
+#   include <sys/mount.h>       /* for *BSD f?statfs() */
+#endif
+#ifdef I_MNTENT
+#   include <mntent.h>          /* for getmntent() */
 #endif
 
 #endif /* IAMSUID */