diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-09 16:56:45 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-09 16:56:45 +0000 |
commit | ca205b6dc7dea34141cb4acd129a3d272d7961c2 (patch) | |
tree | ff040dce1d79f870f61ccf90e7a8a557a2a4f004 /openbsd-compat/bsd-misc.h | |
parent | 233514106dcde5ac61a70f1043de563122e2f1c9 (diff) | |
parent | eab087969b5a57ab226d714fb7e3a1471d6f8dac (diff) | |
download | openssh-baserock/tiagogomes/armv8l64.tar.gz |
Merge remote-tracking branch 'origin/V_6_5' into baserock/tiagogomes/armv8l64baserock/tiagogomes/armv8l64
Conflicts:
ssh_config
sshd_config
Diffstat (limited to 'openbsd-compat/bsd-misc.h')
-rw-r--r-- | openbsd-compat/bsd-misc.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h index e3717562..65c18ec2 100644 --- a/openbsd-compat/bsd-misc.h +++ b/openbsd-compat/bsd-misc.h @@ -1,4 +1,4 @@ -/* $Id: bsd-misc.h,v 1.20 2012/02/14 18:03:31 tim Exp $ */ +/* $Id: bsd-misc.h,v 1.25 2013/08/04 11:48:41 dtucker Exp $ */ /* * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> @@ -51,6 +51,9 @@ int setegid(uid_t); const char *strerror(int); #endif +#if !defined(HAVE_SETLINEBUF) +#define setlinebuf(a) (setvbuf((a), NULL, _IOLBF, 0)) +#endif #ifndef HAVE_UTIMES #ifndef HAVE_STRUCT_TIMEVAL @@ -77,6 +80,10 @@ struct timespec { int nanosleep(const struct timespec *, struct timespec *); #endif +#ifndef HAVE_USLEEP +int usleep(unsigned int useconds); +#endif + #ifndef HAVE_TCGETPGRP pid_t tcgetpgrp(int); #endif @@ -99,4 +106,20 @@ mysig_t mysignal(int sig, mysig_t act); int isblank(int); #endif +#ifndef HAVE_GETPGID +pid_t getpgid(pid_t); +#endif + +#ifndef HAVE_ENDGRENT +# define endgrent() {} +#endif + +#ifndef HAVE_KRB5_GET_ERROR_MESSAGE +# define krb5_get_error_message krb5_get_err_text +#endif + +#ifndef HAVE_KRB5_FREE_ERROR_MESSAGE +# define krb5_free_error_message(a,b) while(0) +#endif + #endif /* _BSD_MISC_H */ |