diff options
author | Tim Rice <tim@multitalents.net> | 2012-02-14 10:03:30 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2012-02-14 10:03:30 -0800 |
commit | e3609c935c93d680e39b9649520bc052576f7fc4 (patch) | |
tree | 5f09a403043df802fa7b68939ff0883c2e7ed65d /openbsd-compat/bsd-misc.h | |
parent | 7b7901c330f7b50e8c6b2929cf329c451bce6c7e (diff) |
- (tim) [openbsd-compat/bsd-misc.h sshd.c] Fix conflicting return type for
unsetenv due to rev 1.14 change to setenv.c. Cast unsetenv to void in sshd.c
ok dtucker@
Diffstat (limited to 'openbsd-compat/bsd-misc.h')
-rw-r--r-- | openbsd-compat/bsd-misc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h index e70c3f9e9..e37175625 100644 --- a/openbsd-compat/bsd-misc.h +++ b/openbsd-compat/bsd-misc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bsd-misc.h,v 1.19 2010/11/08 22:26:23 tim Exp $ */ | 1 | /* $Id: bsd-misc.h,v 1.20 2012/02/14 18:03:31 tim 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> |
@@ -86,7 +86,7 @@ int tcsendbreak(int, int); | |||
86 | #endif | 86 | #endif |
87 | 87 | ||
88 | #ifndef HAVE_UNSETENV | 88 | #ifndef HAVE_UNSETENV |
89 | void unsetenv(const char *); | 89 | int unsetenv(const char *); |
90 | #endif | 90 | #endif |
91 | 91 | ||
92 | /* wrapper for signal interface */ | 92 | /* wrapper for signal interface */ |