summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--defines.h6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e8fd89869..22d0b6d23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120010812
2 - (djm) Fix detection of long long int support. Based on patch from
3 Michael Stone <mstone@cs.loyola.edu>. ok stevesk, tim
4
120010808 520010808
2 - (bal) Minor correction to inet_ntop.h. _BSD_RRESVPORT_H should be 6 - (bal) Minor correction to inet_ntop.h. _BSD_RRESVPORT_H should be
3 _BSD_INET_NTOP_H. Pointed out by Mark Miller <markm@swoon.net> 7 _BSD_INET_NTOP_H. Pointed out by Mark Miller <markm@swoon.net>
@@ -6274,4 +6278,4 @@
6274 - Wrote replacements for strlcpy and mkdtemp 6278 - Wrote replacements for strlcpy and mkdtemp
6275 - Released 1.0pre1 6279 - Released 1.0pre1
6276 6280
6277$Id: ChangeLog,v 1.1469 2001/08/09 00:56:52 mouring Exp $ 6281$Id: ChangeLog,v 1.1470 2001/08/12 03:02:50 djm Exp $
diff --git a/defines.h b/defines.h
index 698270666..397a5443f 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.68 2001/06/29 16:56:16 stevesk Exp $ */ 4/* $Id: defines.h,v 1.69 2001/08/12 03:02:51 djm Exp $ */
5 5
6/* Necessary headers */ 6/* Necessary headers */
7 7
@@ -206,7 +206,6 @@ typedef long int int64_t;
206# if (SIZEOF_LONG_LONG_INT == 8) 206# if (SIZEOF_LONG_LONG_INT == 8)
207typedef long long int int64_t; 207typedef long long int int64_t;
208# define HAVE_INT64_T 1 208# define HAVE_INT64_T 1
209# define HAVE_LONG_LONG_INT
210# endif 209# endif
211# endif 210# endif
212#endif 211#endif
@@ -221,6 +220,9 @@ typedef unsigned long long int u_int64_t;
221# endif 220# endif
222# endif 221# endif
223#endif 222#endif
223#if !defined(HAVE_LONG_LONG_INT) && (SIZEOF_LONG_LONG_INT == 8)
224# define HAVE_LONG_LONG_INT 1
225#endif
224 226
225#ifndef HAVE_SOCKLEN_T 227#ifndef HAVE_SOCKLEN_T
226typedef unsigned int socklen_t; 228typedef unsigned int socklen_t;