Merge from trunk and resolve conflicts.

[gnu-emacs] / nt / inc / unistd.h

diff --git a/nt/inc/unistd.h b/nt/inc/unistd.h
index b75e7d7d6bf5711e8265a85ea55b37b959598c7b..8ad8cf213b1f7aeaec37703228c6d8ce1737947a 100644 (file)
--- a/nt/inc/unistd.h
+++ b/nt/inc/unistd.h
@@ -15,6 +15,7 @@
    and whose prototypes are usually found in unistd.h on POSIX
    platforms.  */
 extern ssize_t readlink (const char *, char *, size_t);
+extern ssize_t readlinkat (int, const char *, char *, size_t);
 extern int symlink (char const *, char const *);
 extern int setpgid (pid_t, pid_t);
 extern pid_t getpgrp (void);
@@ -29,6 +30,11 @@ extern int faccessat (int, char const *, int, int);
 #define AT_EACCESS 4
 #define AT_SYMLINK_NOFOLLOW 4096
 
+#define O_IGNORE_CTTY 0
 #define O_NOCTTY 0
+#define O_NOFOLLOW 0
+
+/* This is normally on stdlib.h, but we don't override that header.  */
+extern int unsetenv (const char *);
 
 #endif /* _UNISTD_H */