__BIT_TYPES_DEFINED__ patch for 3.8p1 on Tru64

Sergio Gelato Sergio.Gelato at astro.su.se
Fri Feb 27 11:35:48 EST 2004


I have found the following simple patch useful for
building OpenSSH 3.8p1 on my Tru64 V4.0G boxes with Heimdal 0.6.
The problem is that Heimdal defines the intXX_t types in <krb5-types.h>
and these then clash with OpenSSH's own definitions in "defines.h".

The patch should be harmless on other platforms (at least if they are
sane and don't define __BIT_TYPES_DEFINED__ without also declaring the
corresponding datatypes).

--- orig/defines.h
+++ mod/defines.h
@@ -143,6 +143,7 @@
 typedef unsigned int u_int;
 #endif
 
+#ifndef __BIT_TYPES_DEFINED__
 #ifndef HAVE_INTXX_T
 # if (SIZEOF_CHAR == 1)
 typedef char int8_t;
@@ -211,6 +212,7 @@
 # endif
 #define __BIT_TYPES_DEFINED__
 #endif
+#endif /* ifndef __BIT_TYPES_DEFINED__ */
 
 /* 64-bit types */
 #ifndef HAVE_INT64_T





More information about the openssh-unix-dev mailing list