some feature test fixes for unistd.h

diff --git a/include/unistd.h b/include/unistd.h
index 9287338cb2a1c5faaeae30b17585184e525ab3ba..693c54dc8ab5a3d2c1ab2c8cb613009778b2b39b 100644 (file)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -13,12 +13,6 @@ extern "C" {
 #define SEEK_CUR 1
 #define SEEK_END 2
 
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define L_SET 0
-#define L_INCR 1
-#define L_XTND 2
-#endif
-
 #undef NULL
 #ifdef __cplusplus
 #define NULL 0
@@ -136,29 +130,41 @@ size_t confstr(int, char *, size_t);
 #define F_TLOCK 2
 #define F_TEST  3
 
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 int lockf(int, int, off_t);
+long gethostid(void);
+int nice(int);
+void sync(void);
+#endif
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
 pid_t setpgrp(void);
 char *crypt(const char *, const char *);
 void encrypt(char *, int);
 void swab(const void *, void *, ssize_t);
-long gethostid(void);
-int nice(int);
-void sync(void);
 #endif
 
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define L_SET 0
+#define L_INCR 1
+#define L_XTND 2
 int brk(void *);
 void *sbrk(intptr_t);
 pid_t vfork(void);
 int vhangup(void);
 int chroot(const char *);
 int getpagesize(void);
+int getdtablesize(void);
 int sethostname(const char *, size_t);
+int getdomainname(char *, size_t);
 int usleep(unsigned);
 unsigned ualarm(unsigned, unsigned);
 int setgroups(size_t, const gid_t []);
 char *getpass(const char *);
+int daemon(int, int);
+void setusershell(void);
+void endusershell(void);
+char *getusershell(void);
 #endif
 
 #ifdef _GNU_SOURCE
@@ -168,12 +174,6 @@ int setresgid(gid_t, gid_t, gid_t);
 int getresuid(uid_t *, uid_t *, uid_t *);
 int getresgid(gid_t *, gid_t *, gid_t *);
 char *get_current_dir_name(void);
-int daemon(int, int);
-int getdomainname(char *, size_t);
-int getdtablesize(void);
-void setusershell(void);
-void endusershell(void);
-char *getusershell(void);
 #endif
 
 #ifdef _LARGEFILE64_SOURCE