aboutsummaryrefslogtreecommitdiff
path: root/include/libssh/misc.h
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2012-12-03 13:31:28 +0100
committerAndreas Schneider <asn@cryptomilk.org>2012-12-03 13:44:02 +0100
commit3896aa43ffe5d4e55f42065529ecaa8fdb39ed04 (patch)
treee3f48f7baf5aec95da17eb54cad28b1963fdae74 /include/libssh/misc.h
parentda8d44ccbaab21c9dedc258b6572f5514c6c9233 (diff)
downloadlibssh-3896aa43ffe5d4e55f42065529ecaa8fdb39ed04.tar.gz
libssh-3896aa43ffe5d4e55f42065529ecaa8fdb39ed04.tar.xz
libssh-3896aa43ffe5d4e55f42065529ecaa8fdb39ed04.zip
BUG 96: Guard ntohll() and htonll prototypes correctly.
Diffstat (limited to 'include/libssh/misc.h')
-rw-r--r--include/libssh/misc.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/libssh/misc.h b/include/libssh/misc.h
index eb6c1afa..f9d06e33 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 */