summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac5
-rw-r--r--defines.h8
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 @@
120110929
2 - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch
3 from des AT des.no
4
120110923 520110923
2 - (djm) [openbsd-compat/getcwd.c] Remove OpenBSD rcsid marker since we no 6 - (djm) [openbsd-compat/getcwd.c] Remove OpenBSD rcsid marker since we no
3 longer want to sync this file (OpenBSD uses a __getcwd syscall now, we 7 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 @@
1# $Id: configure.ac,v 1.480 2011/08/18 04:48:24 tim Exp $ 1# $Id: configure.ac,v 1.481 2011/09/29 01:11:55 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.480 $) 18AC_REVISION($Revision: 1.481 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -2522,7 +2522,6 @@ fi
2522AC_CHECK_TYPES([long long, unsigned long long, long double]) 2522AC_CHECK_TYPES([long long, unsigned long long, long double])
2523 2523
2524# Check datatype sizes 2524# Check datatype sizes
2525AC_CHECK_SIZEOF([char], [1])
2526AC_CHECK_SIZEOF([short int], [2]) 2525AC_CHECK_SIZEOF([short int], [2])
2527AC_CHECK_SIZEOF([int], [4]) 2526AC_CHECK_SIZEOF([int], [4])
2528AC_CHECK_SIZEOF([long int], [4]) 2527AC_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 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.167 2011/06/03 01:17:49 tim Exp $ */ 28/* $Id: defines.h,v 1.168 2011/09/29 01:11:56 djm Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -194,11 +194,7 @@ typedef unsigned int u_int;
194#endif 194#endif
195 195
196#ifndef HAVE_INTXX_T 196#ifndef HAVE_INTXX_T
197# if (SIZEOF_CHAR == 1) 197typedef signed char int8_t;
198typedef char int8_t;
199# else
200# error "8 bit int type not found."
201# endif
202# if (SIZEOF_SHORT_INT == 2) 198# if (SIZEOF_SHORT_INT == 2)
203typedef short int int16_t; 199typedef short int int16_t;
204# else 200# else