2 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7dd5e869c..d36fbc079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
    Fournier <marc.fournier@acadiau.ca>
  - Fix occasional crash on LinuxPPC. Patch from Franz Sirl
    <Franz.Sirl-kernel@lauterbach.com>
+ - Prevent typedefs from being compiled more than once. Report from 
+   Marc G. Fournier <marc.fournier@acadiau.ca>
 
 19991230
  - OpenBSD CVS updates:
diff --git a/defines.h b/defines.h
index 10f72f478..fdd37bb88 100644
--- a/defines.h
+++ b/defines.h
@@ -61,6 +61,7 @@ typedef long int int64_t;
 # else
 #  if (SIZEOF_LONG_LONG_INT == 8)
 typedef long long int int64_t;
+#   define HAVE_INTXX_T
 #  else
 #   error "64 bit int type not found."
 #  endif
@@ -89,6 +90,7 @@ typedef unsigned long int u_int64_t;
 #  else
 #   if (SIZEOF_LONG_LONG_INT == 8)
 typedef unsigned long long int u_int64_t;
+#    define HAVE_U_INTXX_T
 #   else
 #    error "64 bit int type not found."
 #   endif
@@ -100,14 +102,17 @@ typedef unsigned long long int u_int64_t;
 /* being defined by the above */
 #ifndef HAVE_QUAD_T
 typedef int64_t quad_t;
+# define HAVE_QUAD_T
 #endif
 
 #ifndef HAVE_SOCKLEN_T
 typedef unsigned int socklen_t;
+# define HAVE_SOCKLEN_T
 #endif /* HAVE_SOCKLEN_T */
 
 #ifndef HAVE_SIZE_T
 typedef unsigned int size_t;
+# define HAVE_SIZE_T
 #endif /* HAVE_SIZE_T */
 
 /* Paths */