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.h | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'openbsd-compat/bsd-misc.h')
-rw-r--r-- | openbsd-compat/bsd-misc.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h index 33a1d707f..b61ec4244 100644 --- a/openbsd-compat/bsd-misc.h +++ b/openbsd-compat/bsd-misc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bsd-misc.h,v 1.17 2004/08/15 08:41:00 djm Exp $ */ | 1 | /* $Id: bsd-misc.h,v 1.18 2005/02/25 23:07:38 dtucker 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> |
@@ -67,10 +67,6 @@ int utimes(char *, struct timeval *); | |||
67 | int truncate (const char *, off_t); | 67 | int truncate (const char *, off_t); |
68 | #endif /* HAVE_TRUNCATE */ | 68 | #endif /* HAVE_TRUNCATE */ |
69 | 69 | ||
70 | #if !defined(HAVE_SETGROUPS) && defined(SETGROUPS_NOOP) | ||
71 | int setgroups(size_t, const gid_t *); | ||
72 | #endif | ||
73 | |||
74 | #if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP) | 70 | #if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP) |
75 | #ifndef HAVE_STRUCT_TIMESPEC | 71 | #ifndef HAVE_STRUCT_TIMESPEC |
76 | struct timespec { | 72 | struct timespec { |