tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [configure.ac defines.h] Add typedefs for intmax_t and uintmax_t 

for platforms that don't have them.
This commit is contained in:
Darren Tucker 2013-11-03 18:43:55 +11:00
parent 710f374735
commit 007e3b357e
3 changed files with 18 additions and 3 deletions

2
ChangeLog
View File

@ -4,6 +4,8 @@
a no-op in OpenSSH). From chl at openbsd.
- (dtucker) [openbsd-compat/setproctitle.c] Handle error case form the 2nd
vsnprintf. From eric at openbsd via chl@.
- (dtucker) [configure.ac defines.h] Add typedefs for intmax_t and uintmax_t
for platforms that don't have them.
20131030
- (djm) OpenBSD CVS Sync

9
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.536 2013/08/04 11:48:41 dtucker Exp $
# $Id: configure.ac,v 1.537 2013/11/03 07:43:55 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.536 $)
AC_REVISION($Revision: 1.537 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@ -3137,6 +3137,11 @@ if test "x$ac_cv_have_u_char" = "xyes" ; then
AC_DEFINE([HAVE_U_CHAR], [1], [define if you have u_char data type])
fi
AC_CHECK_TYPES([intmax_t, uintmax_t], , , [
#include <sys/types.h>
#include <stdint.h>
])
TYPE_SOCKLEN_T
AC_CHECK_TYPES([sig_atomic_t], , , [#include <signal.h>])

10
defines.h
View File

@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
/* $Id: defines.h,v 1.172 2013/06/01 21:18:48 dtucker Exp $ */
/* $Id: defines.h,v 1.173 2013/11/03 07:43:55 dtucker Exp $ */
/* Constants */
@ -269,6 +269,14 @@ typedef unsigned long long int u_int64_t;
# endif
#endif
#ifndef HAVE_INTMAX_T
typedef long long intmax_t;
#endif
#ifndef HAVE_UINTMAX_T
typedef unsigned long long uintmax_t;
#endif
#ifndef HAVE_U_CHAR
typedef unsigned char u_char;
# define HAVE_U_CHAR