summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authortim <tim>2012-02-14 18:03:30 +0000
committertim <tim>2012-02-14 18:03:30 +0000
commit61be551d4706108c1e2f88e4642b0bc140e5ac7f (patch)
tree5c085c54084c471318c93a5418991d0943299a93 /openbsd-compat
parenta8e0ea90df0c3012d5e6fbeb90f2adf3057bb266 (diff)
downloadopenssh-61be551d4706108c1e2f88e4642b0bc140e5ac7f.tar.gz
- (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')
-rw-r--r--openbsd-compat/bsd-misc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index e70c3f9e..e3717562 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -1,4 +1,4 @@
-/* $Id: bsd-misc.h,v 1.19 2010/11/08 22:26:23 tim Exp $ */
+/* $Id: bsd-misc.h,v 1.20 2012/02/14 18:03:31 tim Exp $ */
/*
* Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
@@ -86,7 +86,7 @@ int tcsendbreak(int, int);
#endif
#ifndef HAVE_UNSETENV
-void unsetenv(const char *);
+int unsetenv(const char *);
#endif
/* wrapper for signal interface */