- markus@cvs.openbsd.org 2001/04/04 15:50:55

[openssh.git] / bufaux.c

diff --git a/bufaux.c b/bufaux.c
index 149677f74a89456f783c87e2f7c605a7e029940a..b17256db66b1b37fe0ea34d9cc9c7a42af5f2b3d 100644 (file)
--- a/bufaux.c
+++ b/bufaux.c
@@ -37,13 +37,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: bufaux.c,v 1.15 2001/01/10 22:56:22 markus Exp $");
+RCSID("$OpenBSD: bufaux.c,v 1.17 2001/01/21 19:05:45 markus Exp $");
 
-#include "ssh.h"
 #include <openssl/bn.h>
 #include "bufaux.h"
 #include "xmalloc.h"
 #include "getput.h"
+#include "log.h"
 
 /*
  * Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed
@@ -90,7 +90,7 @@ buffer_get_bignum(Buffer *buffer, BIGNUM *value)
        bytes = (bits + 7) / 8;
        if (buffer_len(buffer) < bytes)
                fatal("buffer_get_bignum: input buffer too small");
-       bin = (u_char*) buffer_ptr(buffer);
+       bin = (u_char *) buffer_ptr(buffer);
        BN_bin2bn(bin, bytes, value);
        buffer_consume(buffer, bytes);
 
@@ -152,6 +152,7 @@ buffer_get_int(Buffer *buffer)
        return GET_32BIT(buf);
 }
 
+#ifdef HAVE_U_INT64_T
 u_int64_t
 buffer_get_int64(Buffer *buffer)
 {
@@ -159,6 +160,7 @@ buffer_get_int64(Buffer *buffer)
        buffer_get(buffer, (char *) buf, 8);
        return GET_64BIT(buf);
 }
+#endif
 
 /*
  * Stores an integer in the buffer in 4 bytes, msb first.
@@ -171,6 +173,7 @@ buffer_put_int(Buffer *buffer, u_int value)
        buffer_append(buffer, buf, 4);
 }
 
+#ifdef HAVE_U_INT64_T
 void
 buffer_put_int64(Buffer *buffer, u_int64_t value)
 {
@@ -178,6 +181,7 @@ buffer_put_int64(Buffer *buffer, u_int64_t value)
        PUT_64BIT(buf, value);
        buffer_append(buffer, buf, 8);
 }
+#endif
 
 /*
  * Returns an arbitrary binary string from the buffer.  The string cannot