From acfc8ea83fcaa424f2800acda627f919a45e6bb2 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sat, 17 Sep 2011 20:00:13 +0200
Subject: priv: Remove crypto.h and add correct includes to src files.

---
 src/auth.c    | 1 +
 src/config.c  | 3 +++
 src/getpass.c | 1 +
 src/gzip.c    | 8 +++++---
 src/pcap.c    | 1 +
 src/poll.c    | 1 +
 src/scp.c     | 3 +++
 src/session.c | 5 ++++-
 src/threads.c | 3 +++
 9 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/auth.c b/src/auth.c
index 096b615a..8ab80ee0 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "libssh/priv.h"
+#include "libssh/crypto.h"
 #include "libssh/ssh2.h"
 #include "libssh/buffer.h"
 #include "libssh/agent.h"
diff --git a/src/config.c b/src/config.c
index 67111c79..d9a95a23 100644
--- a/src/config.c
+++ b/src/config.c
@@ -21,9 +21,12 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "libssh/priv.h"
 #include "libssh/session.h"
diff --git a/src/getpass.c b/src/getpass.c
index 62f323e6..0bb6a9a9 100644
--- a/src/getpass.c
+++ b/src/getpass.c
@@ -23,6 +23,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <libssh/priv.h>
 
diff --git a/src/gzip.c b/src/gzip.c
index 97c01e63..f89d8645 100644
--- a/src/gzip.c
+++ b/src/gzip.c
@@ -23,9 +23,6 @@
  */
 
 #include "config.h"
-#include "libssh/priv.h"
-#include "libssh/buffer.h"
-#include "libssh/session.h"
 
 #if defined(HAVE_LIBZ) && defined(WITH_LIBZ)
 
@@ -33,6 +30,11 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "libssh/priv.h"
+#include "libssh/buffer.h"
+#include "libssh/crypto.h"
+#include "libssh/session.h"
+
 #define BLOCKSIZE 4092
 
 static z_stream *initcompress(ssh_session session, int level) {
diff --git a/src/pcap.c b/src/pcap.c
index f81c955d..b57b5644 100644
--- a/src/pcap.c
+++ b/src/pcap.c
@@ -32,6 +32,7 @@
 #include <sys/socket.h>
 #endif
 #include <errno.h>
+#include <stdlib.h>
 
 #include "libssh/libssh.h"
 #include "libssh/pcap.h"
diff --git a/src/poll.c b/src/poll.c
index 70a6fdb7..8dfeb14a 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include <errno.h>
+#include <stdlib.h>
 
 #include "libssh/priv.h"
 #include "libssh/libssh.h"
diff --git a/src/scp.c b/src/scp.c
index ac533457..a2efa321 100644
--- a/src/scp.c
+++ b/src/scp.c
@@ -21,8 +21,11 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "libssh/priv.h"
 #include "libssh/scp.h"
diff --git a/src/session.c b/src/session.c
index 34465dfa..1a11ab58 100644
--- a/src/session.c
+++ b/src/session.c
@@ -22,10 +22,13 @@
  */
 
 #include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
-#include "libssh/libssh.h"
+
 #include "libssh/priv.h"
+#include "libssh/libssh.h"
+#include "libssh/crypto.h"
 #include "libssh/server.h"
 #include "libssh/socket.h"
 #include "libssh/ssh2.h"
diff --git a/src/threads.c b/src/threads.c
index c654456e..9d70adfb 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -27,7 +27,10 @@
  * @{
  */
 
+#include "config.h"
+
 #include "libssh/priv.h"
+#include "libssh/crypto.h"
 #include "libssh/threads.h"
 
 static int threads_noop (void **lock){
-- 
cgit