aboutsummaryrefslogtreecommitdiff
path: root/include/libssh/priv.h
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-09-17 11:53:46 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-09-18 21:37:17 +0200
commitabd9856c6a5bc9a29dd9296125628502b810208e (patch)
treeaf4863145b4628dbb9b07d065784bfe7c2e0d24b /include/libssh/priv.h
parent4a6a0987a8d113b4c1ce14f9fd60c3ca196621f0 (diff)
downloadlibssh-abd9856c6a5bc9a29dd9296125628502b810208e.tar.gz
libssh-abd9856c6a5bc9a29dd9296125628502b810208e.tar.xz
libssh-abd9856c6a5bc9a29dd9296125628502b810208e.zip
priv: Move defines to the top.
Diffstat (limited to 'include/libssh/priv.h')
-rw-r--r--include/libssh/priv.h23
1 files changed, 8 insertions, 15 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index a757b389..5c34b17e 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -94,6 +94,8 @@
# endif /* _MSC_VER */
+int gettimeofday(struct timeval *__p, void *__t);
+
#else /* _WIN32 */
#include <unistd.h>
@@ -112,11 +114,16 @@
#define CLIENTBANNER2 "SSH-2.0-libssh-" SSH_STRINGIFY(LIBSSH_VERSION)
#define KBDINT_MAX_PROMPT 256 /* more than openssh's :) */
+#ifndef __FUNCTION__
+#if defined(__SUNPRO_C)
+#define __FUNCTION__ __func__
+#endif
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
-
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
@@ -127,9 +134,6 @@ struct error_struct {
char error_buffer[ERROR_BUFFERLEN];
};
-/* TODO: remove that include */
-#include "libssh/wrapper.h"
-
struct ssh_message_struct;
struct ssh_common_struct;
struct ssh_kex_struct;
@@ -220,17 +224,6 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
int message_handle(ssh_session session, void *user, uint8_t type, ssh_buffer packet);
-/* misc.c */
-#ifdef _WIN32
-int gettimeofday(struct timeval *__p, void *__t);
-#endif /* _WIN32 */
-
-#ifndef __FUNCTION__
-#if defined(__SUNPRO_C)
-#define __FUNCTION__ __func__
-#endif
-#endif
-
#define _enter_function(sess) \
do {\
if((sess)->common.log_verbosity >= SSH_LOG_FUNCTIONS){ \