summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2001-03-18 18:27:26 -0800
committerTim Rice <tim@multitalents.net>2001-03-18 18:27:26 -0800
commitd19a75abd0dc0487f9b6235b55a736f0386481c3 (patch)
treef76344d17a31ff78271d29323a8e8e225327533e
parent753b1c05a5cae0b38289d9a7d080c1d931c9ce6c (diff)
move HAVE_LONG_LONG_INT where it works
-rw-r--r--ChangeLog4
-rw-r--r--defines.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 94052a5ed..48002a7b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
7 [auth-options.c] 7 [auth-options.c]
8 ignore permitopen="host:port" if AllowTcpForwarding==no 8 ignore permitopen="host:port" if AllowTcpForwarding==no
9 - (djm) Make scp work on systems without 64-bit ints 9 - (djm) Make scp work on systems without 64-bit ints
10 - tim@mindrot.org 2001/03/18 18:28:39 [defines.h]
11 move HAVE_LONG_LONG_INT where it works
10 12
1120010318 1320010318
12 - (bal) Fixed scp type casing issue which causes "scp: protocol error: 14 - (bal) Fixed scp type casing issue which causes "scp: protocol error:
@@ -4606,4 +4608,4 @@
4606 - Wrote replacements for strlcpy and mkdtemp 4608 - Wrote replacements for strlcpy and mkdtemp
4607 - Released 1.0pre1 4609 - Released 1.0pre1
4608 4610
4609$Id: ChangeLog,v 1.975 2001/03/19 01:45:02 djm Exp $ 4611$Id: ChangeLog,v 1.976 2001/03/19 02:27:26 tim Exp $
diff --git a/defines.h b/defines.h
index 608965121..9d58db38d 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
1#ifndef _DEFINES_H 1#ifndef _DEFINES_H
2#define _DEFINES_H 2#define _DEFINES_H
3 3
4/* $Id: defines.h,v 1.58 2001/03/19 01:56:14 djm Exp $ */ 4/* $Id: defines.h,v 1.59 2001/03/19 02:27:26 tim Exp $ */
5 5
6/* Some platforms need this for the _r() functions */ 6/* Some platforms need this for the _r() functions */
7#if !defined(_REENTRANT) && !defined(SNI) 7#if !defined(_REENTRANT) && !defined(SNI)
@@ -125,9 +125,6 @@ enum
125/* If sys/types.h does not supply intXX_t, supply them ourselves */ 125/* If sys/types.h does not supply intXX_t, supply them ourselves */
126/* (or die trying) */ 126/* (or die trying) */
127 127
128#ifdef SIZEOF_LONG_LONG_INT
129# define HAVE_LONG_LONG_INT
130#endif
131 128
132#ifndef HAVE_U_INT 129#ifndef HAVE_U_INT
133typedef unsigned int u_int; 130typedef unsigned int u_int;
@@ -202,6 +199,7 @@ typedef long int int64_t;
202# if (SIZEOF_LONG_LONG_INT == 8) 199# if (SIZEOF_LONG_LONG_INT == 8)
203typedef long long int int64_t; 200typedef long long int int64_t;
204# define HAVE_INT64_T 1 201# define HAVE_INT64_T 1
202# define HAVE_LONG_LONG_INT
205# endif 203# endif
206# endif 204# endif
207#endif 205#endif