diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /openbsd-compat/bsd-misc.h | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'openbsd-compat/bsd-misc.h')
-rw-r--r-- | openbsd-compat/bsd-misc.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h index eac5217ca..430066376 100644 --- a/openbsd-compat/bsd-misc.h +++ b/openbsd-compat/bsd-misc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bsd-misc.h,v 1.21 2012/07/03 22:50:10 dtucker Exp $ */ | 1 | /* $Id: bsd-misc.h,v 1.23 2013/03/14 23:34:27 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> | 4 | * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> |
@@ -80,6 +80,10 @@ struct timespec { | |||
80 | int nanosleep(const struct timespec *, struct timespec *); | 80 | int nanosleep(const struct timespec *, struct timespec *); |
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | #ifndef HAVE_USLEEP | ||
84 | int usleep(unsigned int useconds); | ||
85 | #endif | ||
86 | |||
83 | #ifndef HAVE_TCGETPGRP | 87 | #ifndef HAVE_TCGETPGRP |
84 | pid_t tcgetpgrp(int); | 88 | pid_t tcgetpgrp(int); |
85 | #endif | 89 | #endif |
@@ -102,4 +106,8 @@ mysig_t mysignal(int sig, mysig_t act); | |||
102 | int isblank(int); | 106 | int isblank(int); |
103 | #endif | 107 | #endif |
104 | 108 | ||
109 | #ifndef HAVE_GETPGID | ||
110 | pid_t getpgid(pid_t); | ||
111 | #endif | ||
112 | |||
105 | #endif /* _BSD_MISC_H */ | 113 | #endif /* _BSD_MISC_H */ |