about summary refs log tree commit diff
path: root/posix
diff options
context:
space:
mode:
Diffstat (limited to 'posix')
-rw-r--r--posix/sys/wait.h2
-rw-r--r--posix/unistd.h7
2 files changed, 4 insertions, 5 deletions
diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index f889ada2a5..8983a8fa31 100644
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -28,7 +28,6 @@
 __BEGIN_DECLS
 
 #include <signal.h>
-#include <sys/resource.h>
 
 /* These macros could also be defined in <stdlib.h>.  */
 #if !defined _STDLIB_H || (!defined __USE_XOPEN && !defined __USE_XOPEN2K8)
@@ -138,6 +137,7 @@ extern __pid_t wait (__WAIT_STATUS __stat_loc);
 extern __pid_t waitpid (__pid_t __pid, int *__stat_loc, int __options);
 
 #if defined __USE_SVID || defined __USE_XOPEN || defined __USE_XOPEN2K8
+# include <sys/resource.h>
 # define __need_siginfo_t
 # include <bits/siginfo.h>
 /* Wait for a childing matching IDTYPE and ID to change the status and
diff --git a/posix/unistd.h b/posix/unistd.h
index ce43450cd4..6f509e96d8 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -971,13 +971,11 @@ extern char *getpass (const char *__prompt) __nonnull ((1));
 #endif /* Use BSD || X/Open.  */
 
 
-#if defined __USE_BSD || defined __USE_XOPEN || defined __USE_XOPEN2K
 /* Make all changes done to FD actually appear on disk.
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern int fsync (int __fd);
-#endif /* Use BSD || X/Open || Unix98.  */
 
 
 #ifdef __USE_GNU
@@ -1032,7 +1030,8 @@ extern int truncate64 (const char *__file, __off64_t __length)
 
 #endif /* Use BSD || X/Open Unix || POSIX 2008.  */
 
-#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
+#if defined __USE_BSD || defined __USE_POSIX199309 \
+    || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
 
 /* Truncate the file FD is open on to LENGTH bytes.  */
 # ifndef __USE_FILE_OFFSET64
@@ -1049,7 +1048,7 @@ extern int __REDIRECT_NTH (ftruncate, (int __fd, __off64_t __length),
 extern int ftruncate64 (int __fd, __off64_t __length) __THROW __wur;
 # endif
 
-#endif /* Use BSD || X/Open Unix || POSIX 2003.  */
+#endif /* Use BSD || POSIX.1b || X/Open Unix || XPG6.  */
 
 
 #if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \