diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /openbsd-compat/bsd-misc.c | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'openbsd-compat/bsd-misc.c')
-rw-r--r-- | openbsd-compat/bsd-misc.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c index 1b276b4f4..41f92cce9 100644 --- a/openbsd-compat/bsd-misc.c +++ b/openbsd-compat/bsd-misc.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | #include "xmalloc.h" | 19 | #include "xmalloc.h" |
20 | 20 | ||
21 | RCSID("$Id: bsd-misc.c,v 1.25 2004/08/15 08:41:00 djm Exp $"); | 21 | RCSID("$Id: bsd-misc.c,v 1.26 2005/02/25 23:07:38 dtucker Exp $"); |
22 | 22 | ||
23 | #ifndef HAVE___PROGNAME | 23 | #ifndef HAVE___PROGNAME |
24 | char *__progname; | 24 | char *__progname; |
@@ -122,17 +122,6 @@ int truncate(const char *path, off_t length) | |||
122 | } | 122 | } |
123 | #endif /* HAVE_TRUNCATE */ | 123 | #endif /* HAVE_TRUNCATE */ |
124 | 124 | ||
125 | #if !defined(HAVE_SETGROUPS) && defined(SETGROUPS_NOOP) | ||
126 | /* | ||
127 | * Cygwin setgroups should be a noop. | ||
128 | */ | ||
129 | int | ||
130 | setgroups(size_t size, const gid_t *list) | ||
131 | { | ||
132 | return (0); | ||
133 | } | ||
134 | #endif | ||
135 | |||
136 | #if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP) | 125 | #if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP) |
137 | int nanosleep(const struct timespec *req, struct timespec *rem) | 126 | int nanosleep(const struct timespec *req, struct timespec *rem) |
138 | { | 127 | { |