MS-Windows followup for 2012-11-14T04:55:41Z!eggert@cs.ucla.edu, regarding faccessat.

 nt/inc/unistd.h (faccessat): Add prototype.
 (AT_FDCWD, AT_EACCESS, AT_SYMLINK_NOFOLLOW): New macros; the first
 2 moved from ms-w32.h.
 nt/inc/ms-w32.h (AT_FDCWD, AT_EACCESS, faccessat): Remove macros.

 src/w32.c (faccessat): Rename from sys_faccessat.  (No need to use a
 different name, as the MS runtime does not have such a function,
 and probably never will.)  All callers changed.  Ignore DIRFD
 value if PATH is an absolute file name, to match Posix spec
 better.  If AT_SYMLINK_NOFOLLOW is set in FLAGS, don't resolve
 symlinks.

Fixes: debbugs:12632

3 files changed, 16 insertions, 5 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 320c9e6366e..685e291e272 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/unistd.h (faccessat): Add prototype.
+        (AT_FDCWD, AT_EACCESS, AT_SYMLINK_NOFOLLOW): New macros; the first
+        2 moved from ms-w32.h.
+
+        * inc/ms-w32.h (AT_FDCWD, AT_EACCESS, faccessat): Remove macros.
+
 2012-11-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use faccessat, not access, when checking file permissions (Bug#12632).
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 0f6b51d3915..1b2a309e1be 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -124,10 +124,6 @@ extern char *getenv ();
 #define MAXPATHLEN      _MAX_PATH
 #endif
 
-/* Use values compatible with gnulib, as there's no reason to differ.  */
-#define AT_FDCWD (-3041965)
-#define AT_EACCESS 4
-
 #ifdef HAVE_NTGUI
 #define HAVE_WINDOW_SYSTEM 1
 #define HAVE_MENUS 1
@@ -163,7 +159,6 @@ extern char *getenv ();
 #define dup     sys_dup
 #undef dup2
 #define dup2    sys_dup2
-#define faccessat  sys_faccessat
 #define fopen   sys_fopen
 #define link    sys_link
 #define localtime sys_localtime
diff --git a/nt/inc/unistd.h b/nt/inc/unistd.h
index 4c5f7d4c124..b0f3092cafb 100644
--- a/nt/inc/unistd.h
+++ b/nt/inc/unistd.h
@@ -18,4 +18,12 @@ extern pid_t getpgrp (void);
 extern pid_t setsid (void);
 extern pid_t tcgetpgrp (int);
 
+extern int faccessat (int, char const *, int, int);
+
+/* These are normally on fcntl.h, but we don't override that header.  */
+/* Use values compatible with gnulib, as there's no reason to differ.  */
+#define AT_FDCWD (-3041965)
+#define AT_EACCESS 4
+#define AT_SYMLINK_NOFOLLOW 4096
+
 #endif  /* _UNISTD_H */