- (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed.

This commit is contained in:
Darren Tucker 2009-03-07 12:32:22 +11:00
parent 8aae6ff0d9
commit ccfee05882
3 changed files with 8 additions and 4 deletions

View File

@ -5,6 +5,7 @@
- (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add
EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c
to use them. Allows building with older OpenSSL versions.
- (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed.
20090306
- (djm) OpenBSD CVS Sync

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.415 2009/02/16 04:37:03 djm Exp $
# $Id: configure.ac,v 1.416 2009/03/07 01:32:22 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
AC_REVISION($Revision: 1.415 $)
AC_REVISION($Revision: 1.416 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h)
@ -2694,7 +2694,7 @@ AC_CHECK_TYPES([fsblkcnt_t, fsfilcnt_t],,,[
#endif
])
AC_CHECK_TYPES(in_addr_t,,,
AC_CHECK_TYPES([in_addr_t in_port_t],,,
[#include <sys/types.h>
#include <netinet/in.h>])

View File

@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
/* $Id: defines.h,v 1.153 2009/02/01 11:19:54 dtucker Exp $ */
/* $Id: defines.h,v 1.154 2009/03/07 01:32:22 dtucker Exp $ */
/* Constants */
@ -300,6 +300,9 @@ struct sockaddr_un {
#ifndef HAVE_IN_ADDR_T
typedef u_int32_t in_addr_t;
#endif
#ifndef HAVE_IN_PORT_T
typedef u_int16_t in_port_t;
#endif
#if defined(BROKEN_SYS_TERMIO_H) && !defined(_STRUCT_WINSIZE)
#define _STRUCT_WINSIZE