From 3896aa43ffe5d4e55f42065529ecaa8fdb39ed04 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 3 Dec 2012 13:31:28 +0100
Subject: BUG 96: Guard ntohll() and htonll prototypes correctly.

---
 include/libssh/misc.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'include/libssh/misc.h')

diff --git a/include/libssh/misc.h b/include/libssh/misc.h
index eb6c1af..f9d06e3 100644
--- a/include/libssh/misc.h
+++ b/include/libssh/misc.h
@@ -34,9 +34,14 @@ int ssh_analyze_banner(ssh_session session, int server, int *ssh1, int *ssh2);
 int ssh_is_ipaddr_v4(const char *str);
 int ssh_is_ipaddr(const char *str);
 
+#ifndef HAVE_NTOHLL
 /* macro for byte ordering */
 uint64_t ntohll(uint64_t);
-#define htonll(x) ntohll(x)
+#endif
+
+#ifndef HAVE_HTONLL
+#define htonll(x) ntohll((x))
+#endif
 
 /* list processing */
 
-- 
cgit