[PATCH] _BSD_SOURCE for unistd.h, take 2

[Isaac Dunham <idunham@lavabit.com>]

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

This is what was left from the comments.

This adds L_SET & co., and defines 5 functions that had been under
_GNU_SOURCE only, when _BSD_SOURCE is defined.
If I wanted to make things a little easier on those porting, I might
add something like this when _BSD_SOURCE is defined:
#warn "BSD setpgrp should be changed to setpgid"
That's not essential, though.

[-- Attachment #2: unistd.diff --]
[-- Type: text/x-patch, Size: 1029 bytes --]

diff --git a/include/unistd.h b/include/unistd.h
index 7662e51..d924886 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -16,6 +16,12 @@ extern "C" {
 #define SEEK_CUR 1
 #define SEEK_END 2
 
+#if defined(_BSD_SOURCE) && !defined(L_SET)
+#define L_SET	SEEK_SET
+#define L_INCR	SEEK_CUR
+#define L_XTND	SEEK_END
+#endif
+
 #undef NULL
 #ifdef __cplusplus
 #define NULL 0
@@ -144,17 +150,20 @@ void sync(void);
 int getdtablesize(void);
 #endif
 
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+pid_t vfork(void);
+int vhangup(void);
+int chroot(const char *);
+int usleep(unsigned);
+unsigned ualarm(unsigned, unsigned);
+#endif
+
 #ifdef _GNU_SOURCE
 int brk(void *);
 void *sbrk(intptr_t);
 pid_t forkall(void);
-pid_t vfork(void);
-int vhangup(void);
-int chroot(const char *);
 int getpagesize(void);
 int sethostname(const char *, size_t);
-int usleep(unsigned);
-unsigned ualarm(unsigned, unsigned);
 int setgroups(size_t, const gid_t []);
 int setresuid(uid_t, uid_t, uid_t);
 int setresgid(gid_t, gid_t, gid_t);