From 5ffe1c4b437a519c90b2017ce8afeef0f845207c Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 29 Sep 2011 11:11:51 +1000 Subject: [PATCH] - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch from des AT des.no --- ChangeLog | 4 ++++ configure.ac | 5 ++--- defines.h | 8 ++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13f736397..1e07c1bd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20110929 + - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch + from des AT des.no + 20110923 - (djm) [openbsd-compat/getcwd.c] Remove OpenBSD rcsid marker since we no longer want to sync this file (OpenBSD uses a __getcwd syscall now, we diff --git a/configure.ac b/configure.ac index 7a915272d..38e260ce7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.480 2011/08/18 04:48:24 tim Exp $ +# $Id: configure.ac,v 1.481 2011/09/29 01:11:55 djm 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.480 $) +AC_REVISION($Revision: 1.481 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -2522,7 +2522,6 @@ fi AC_CHECK_TYPES([long long, unsigned long long, long double]) # Check datatype sizes -AC_CHECK_SIZEOF([char], [1]) AC_CHECK_SIZEOF([short int], [2]) AC_CHECK_SIZEOF([int], [4]) AC_CHECK_SIZEOF([long int], [4]) diff --git a/defines.h b/defines.h index e4ccc5407..45612aab4 100644 --- a/defines.h +++ b/defines.h @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.167 2011/06/03 01:17:49 tim Exp $ */ +/* $Id: defines.h,v 1.168 2011/09/29 01:11:56 djm Exp $ */ /* Constants */ @@ -194,11 +194,7 @@ typedef unsigned int u_int; #endif #ifndef HAVE_INTXX_T -# if (SIZEOF_CHAR == 1) -typedef char int8_t; -# else -# error "8 bit int type not found." -# endif +typedef signed char int8_t; # if (SIZEOF_SHORT_INT == 2) typedef short int int16_t; # else