And even more glibc fcntl constants, this time mostly F_XXX.

Be more conservative and use @EXPORT_OK instead of @EXPORT.

p4raw-id: //depot/perl@19798

2 files changed, 43 insertions, 24 deletions

diff --git a/ext/Fcntl/Fcntl.pm b/ext/Fcntl/Fcntl.pm
index 5da86f6232..5153ad5393 100644
--- a/ext/Fcntl/Fcntl.pm
+++ b/ext/Fcntl/Fcntl.pm
@@ -114,16 +114,12 @@ $VERSION = "1.04";
 	O_DSYNC
 	O_EXCL
 	O_EXLOCK
-	O_IGNORE_CTTY
 	O_LARGEFILE
 	O_NDELAY
-	O_NOATIME
 	O_NOCTTY
 	O_NOFOLLOW
 	O_NOINHERIT
-	O_NOLINK
 	O_NONBLOCK
-	O_NOTRANS
 	O_RANDOM
 	O_RAW
 	O_RDONLY
@@ -141,6 +137,13 @@ $VERSION = "1.04";
 
 # Other items we are prepared to export if requested
 @EXPORT_OK = qw(
+	DN_ACCESS
+	DN_ATTRIB
+	DN_CREATE
+	DN_DELETE
+	DN_MODIFY
+	DN_MULTISHOT
+	DN_RENAME
 	FAPPEND
 	FASYNC
 	FCREAT
@@ -153,22 +156,35 @@ $VERSION = "1.04";
 	FRSYNC
 	FSYNC
 	FTRUNC
+	F_GETLEASE
+	F_GETSIG
+	F_NOTIFY
+	F_SETLEASE
+	F_SETSIG
 	LOCK_EX
+	LOCK_MAND
 	LOCK_NB
+	LOCK_READ
+	LOCK_RW
 	LOCK_SH
 	LOCK_UN
-	S_ISUID S_ISGID S_ISVTX S_ISTXT
-	_S_IFMT S_IFREG S_IFDIR S_IFLNK
+	LOCK_WRITE
+	O_IGNORE_CTTY
+	O_NOATIME
+	O_NOLINK
+	O_NOTRANS
+	SEEK_CUR
+	SEEK_END
+	SEEK_SET
 	S_IFSOCK S_IFBLK S_IFCHR S_IFIFO S_IFWHT S_ENFMT
-	S_IRUSR S_IWUSR S_IXUSR S_IRWXU
+	S_IREAD S_IWRITE S_IEXEC
 	S_IRGRP S_IWGRP S_IXGRP S_IRWXG
 	S_IROTH S_IWOTH S_IXOTH S_IRWXO
-	S_IREAD S_IWRITE S_IEXEC
+	S_IRUSR S_IWUSR S_IXUSR S_IRWXU
+	S_ISUID S_ISGID S_ISVTX S_ISTXT
+	_S_IFMT S_IFREG S_IFDIR S_IFLNK
 	&S_ISREG &S_ISDIR &S_ISLNK &S_ISSOCK &S_ISBLK &S_ISCHR &S_ISFIFO
 	&S_ISWHT &S_ISENFMT &S_IFMT &S_IMODE
-	SEEK_SET
-	SEEK_CUR
-	SEEK_END
 );
 # Named groups of exports
 %EXPORT_TAGS = (
diff --git a/ext/Fcntl/Makefile.PL b/ext/Fcntl/Makefile.PL
index 102d1b6c85..6ba40a59df 100644
--- a/ext/Fcntl/Makefile.PL
+++ b/ext/Fcntl/Makefile.PL
@@ -9,19 +9,22 @@ WriteMakefile(
 );
 
 my @names = (qw(
-	       FAPPEND FASYNC FCREAT FDEFER FDSYNC FD_CLOEXEC FEXCL
-	       FLARGEFILE FNDELAY FNONBLOCK FRSYNC FSYNC FTRUNC
-	       F_ALLOCSP F_ALLOCSP64 F_COMPAT F_DUP2FD F_DUPFD F_EXLCK
-	       F_FREESP F_FREESP64 F_FSYNC F_FSYNC64 F_GETFD F_GETFL
-	       F_GETLK F_GETLK64 F_GETOWN F_NODNY F_POSIX F_RDACC
-	       F_RDDNY F_RDLCK F_RWACC F_RWDNY F_SETFD F_SETFL F_SETLK
-	       F_SETLK64 F_SETLKW F_SETLKW64 F_SETOWN F_SHARE F_SHLCK
-	       F_UNLCK F_UNSHARE F_WRACC F_WRDNY F_WRLCK O_ACCMODE
-	       O_ALIAS O_APPEND O_ASYNC O_BINARY O_CREAT O_DEFER
-	       O_DIRECT O_DIRECTORY O_DSYNC O_EXCL O_EXLOCK
-	       O_IGNORE_CTTY O_LARGEFILE O_NDELAY O_NOATIME O_NOCTTY
-	       O_NOFOLLOW O_NOINHERIT O_NOLINK O_NONBLOCK O_NOTRANS
-	       O_RANDOM O_RAW O_RDONLY O_RDWR O_RSRC O_RSYNC
+	       DN_ACCESS DN_MODIFY DN_CREATE DN_DELETE DN_RENAME
+	       DN_ATTRIB DN_MULTISHOT FAPPEND FASYNC FCREAT FDEFER
+	       FDSYNC FD_CLOEXEC FEXCL FLARGEFILE FNDELAY FNONBLOCK
+	       FRSYNC FSYNC FTRUNC F_ALLOCSP F_ALLOCSP64 F_COMPAT
+	       F_DUP2FD F_DUPFD F_EXLCK F_FREESP F_FREESP64 F_FSYNC
+	       F_FSYNC64 F_GETFD F_GETFL F_GETLEASE F_GETLK F_GETLK64
+	       F_GETOWN F_GETSIG F_NODNY F_NOTIFY F_POSIX F_RDACC
+	       F_RDDNY F_RDLCK F_RWACC F_RWDNY F_SETFD F_SETFL
+	       F_SETLEASE F_SETLK F_SETLK64 F_SETLKW F_SETLKW64
+	       F_SETOWN F_SETSIG F_SHARE F_SHLCK F_UNLCK F_UNSHARE
+	       F_WRACC F_WRDNY F_WRLCK LOCK_MAND LOCK_READ LOCK_WRITE
+	       LOCK_RW O_ACCMODE O_ALIAS O_APPEND O_ASYNC O_BINARY
+	       O_CREAT O_DEFER O_DIRECT O_DIRECTORY O_DSYNC O_EXCL
+	       O_EXLOCK O_IGNORE_CTTY O_LARGEFILE O_NDELAY O_NOATIME
+	       O_NOCTTY O_NOFOLLOW O_NOINHERIT O_NOLINK O_NONBLOCK
+	       O_NOTRANS O_RANDOM O_RAW O_RDONLY O_RDWR O_RSRC O_RSYNC
 	       O_SEQUENTIAL O_SHLOCK O_SYNC O_TEMPORARY O_TEXT O_TRUNC
 	       O_WRONLY S_ENFMT S_IEXEC S_IFBLK S_IFCHR S_IFDIR
 	       S_IFIFO S_IFLNK S_IFREG S_IFSOCK S_IFWHT S_IREAD