- (tim) [roaming_client.c] Use of <sys/queue.h> is not really portable so

   we use "openbsd-compat/sys-queue.h"

2 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 00d78c69..14595568 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
  - (tim) [regress/portnum.sh] Shell portability fix.
  - (tim) [configure.ac] Define BROKEN_GETADDRINFO on SVR5 systems. The native
    getaddrinfo() is too old and limited for addr_pton() in addrmatch.c.
+ - (tim) [roaming_client.c] Use of <sys/queue.h> is not really portable so
+   we use "openbsd-compat/sys-queue.h"
 
 20100115
  - (dtucker) OpenBSD CVS Sync
diff --git a/roaming_client.c b/roaming_client.c
index cc387a54..c0dd9ea9 100644
--- a/roaming_client.c
+++ b/roaming_client.c
@@ -17,7 +17,7 @@
 
 #include "includes.h"
 
-#include <sys/queue.h>
+#include "openbsd-compat/sys-queue.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 
@@ -122,7 +122,7 @@ roaming_auth_required(void)
 	calculate_new_key(&key1, cookie, chall);
 	calculate_new_key(&key2, cookie, chall);
 
-	debug("Received %llu bytes", (long long unsigned)get_recv_bytes());
+	debug("Received %llu bytes", (unsigned long long)get_recv_bytes());
 	debug("Sent roaming_auth packet");
 }
 
@@ -216,7 +216,7 @@ roaming_resume(void)
 		goto fail;
 	}
 	recv_bytes = packet_get_int64() ^ oldkey2;
-	debug("Peer received %llu bytes", (long long unsigned)recv_bytes);
+	debug("Peer received %llu bytes", (unsigned long long)recv_bytes);
 	resend_bytes(packet_get_connection_out(), &recv_bytes);
 
 	resume_in_progress = 0;