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 @@
+20010812
+ - (djm) Fix detection of long long int support. Based on patch from 
+   Michael Stone <mstone@cs.loyola.edu>. ok stevesk, tim
+
 20010808
  - (bal) Minor correction to inet_ntop.h.  _BSD_RRESVPORT_H should be
    _BSD_INET_NTOP_H.  Pointed out by Mark Miller <markm@swoon.net> 
@@ -6274,4 +6278,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1469 2001/08/09 00:56:52 mouring Exp $
+$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 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.68 2001/06/29 16:56:16 stevesk Exp $ */
+/* $Id: defines.h,v 1.69 2001/08/12 03:02:51 djm Exp $ */
 
 /* Necessary headers */
 
@@ -206,7 +206,6 @@ typedef long int int64_t;
 #  if (SIZEOF_LONG_LONG_INT == 8)
 typedef long long int int64_t;
 #   define HAVE_INT64_T 1
-#   define HAVE_LONG_LONG_INT
 #  endif
 # endif
 #endif
@@ -221,6 +220,9 @@ typedef unsigned long long int u_int64_t;
 #  endif
 # endif
 #endif
+#if !defined(HAVE_LONG_LONG_INT) && (SIZEOF_LONG_LONG_INT == 8)
+# define HAVE_LONG_LONG_INT 1
+#endif
 
 #ifndef HAVE_SOCKLEN_T
 typedef unsigned int socklen_t;