mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-31 01:35:11 +02:00
- (djm) Use sa_family_t in prototype for rresvport_af. Patch from
Svante Signell <svante.signell@telia.com> - (djm) Autoconf logic to define sa_family_t if it is missing
This commit is contained in:
parent
c19fd5f4e2
commit
b54b40ef06
@ -1,3 +1,8 @@
|
|||||||
|
20000623
|
||||||
|
- (djm) Use sa_family_t in prototype for rresvport_af. Patch from
|
||||||
|
Svante Signell <svante.signell@telia.com>
|
||||||
|
- (djm) Autoconf logic to define sa_family_t if it is missing
|
||||||
|
|
||||||
20000622
|
20000622
|
||||||
- (djm) Automatically generate host key during "make install". Suggested
|
- (djm) Automatically generate host key during "make install". Suggested
|
||||||
by Gary E. Miller <gem@rellim.com>
|
by Gary E. Miller <gem@rellim.com>
|
||||||
|
@ -158,6 +158,7 @@
|
|||||||
#undef HAVE_SSIZE_T
|
#undef HAVE_SSIZE_T
|
||||||
#undef HAVE_MODE_T
|
#undef HAVE_MODE_T
|
||||||
#undef HAVE_PID_T
|
#undef HAVE_PID_T
|
||||||
|
#undef HAVE_SA_FAMILY_T
|
||||||
#undef HAVE_STRUCT_SOCKADDR_STORAGE
|
#undef HAVE_STRUCT_SOCKADDR_STORAGE
|
||||||
#undef HAVE_STRUCT_ADDRINFO
|
#undef HAVE_STRUCT_ADDRINFO
|
||||||
#undef HAVE_STRUCT_IN6_ADDR
|
#undef HAVE_STRUCT_IN6_ADDR
|
||||||
|
@ -55,7 +55,7 @@ rresvport(alport)
|
|||||||
int
|
int
|
||||||
rresvport_af(alport, af)
|
rresvport_af(alport, af)
|
||||||
int *alport;
|
int *alport;
|
||||||
int af;
|
sa_family_t af;
|
||||||
{
|
{
|
||||||
struct sockaddr_storage ss;
|
struct sockaddr_storage ss;
|
||||||
struct sockaddr *sa;
|
struct sockaddr *sa;
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#ifndef HAVE_RRESVPORT_AF
|
#ifndef HAVE_RRESVPORT_AF
|
||||||
int rresvport_af(int *alport, int af);
|
int rresvport_af(int *alport, sa_family_t af);
|
||||||
#endif /* !HAVE_RRESVPORT_AF */
|
#endif /* !HAVE_RRESVPORT_AF */
|
||||||
|
|
||||||
#endif /* _BSD_RRESVPORT_H */
|
#endif /* _BSD_RRESVPORT_H */
|
||||||
|
15
configure.in
15
configure.in
@ -502,6 +502,21 @@ if test "x$ac_cv_have_ssize_t" = "xyes" ; then
|
|||||||
AC_DEFINE(HAVE_SSIZE_T)
|
AC_DEFINE(HAVE_SSIZE_T)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_CACHE_CHECK([for sa_family_t], ac_cv_have_sa_family_t, [
|
||||||
|
AC_TRY_COMPILE(
|
||||||
|
[
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
],
|
||||||
|
[ sa_family_t foo; foo = 1235; ],
|
||||||
|
[ ac_cv_have_sa_family_t="yes" ],
|
||||||
|
[ ac_cv_have_sa_family_t="no" ]
|
||||||
|
)
|
||||||
|
])
|
||||||
|
if test "x$ac_cv_have_sa_family_t" = "xyes" ; then
|
||||||
|
AC_DEFINE(HAVE_SA_FAMILY_T)
|
||||||
|
fi
|
||||||
|
|
||||||
AC_CACHE_CHECK([for pid_t], ac_cv_have_pid_t, [
|
AC_CACHE_CHECK([for pid_t], ac_cv_have_pid_t, [
|
||||||
AC_TRY_COMPILE(
|
AC_TRY_COMPILE(
|
||||||
[
|
[
|
||||||
|
@ -187,6 +187,11 @@ typedef int ssize_t;
|
|||||||
# define HAVE_SSIZE_T
|
# define HAVE_SSIZE_T
|
||||||
#endif /* HAVE_SSIZE_T */
|
#endif /* HAVE_SSIZE_T */
|
||||||
|
|
||||||
|
#ifndef HAVE_SA_FAMILY_T
|
||||||
|
typedef int sa_family_t;
|
||||||
|
# define HAVE_SA_FAMILY_T
|
||||||
|
#endif /* HAVE_SA_FAMILY_T */
|
||||||
|
|
||||||
#ifndef HAVE_PID_T
|
#ifndef HAVE_PID_T
|
||||||
typedef int pid_t;
|
typedef int pid_t;
|
||||||
# define HAVE_PID_T
|
# define HAVE_PID_T
|
||||||
|
Loading…
x
Reference in New Issue
Block a user