From 79c475c9170519a05fa707f66478aaa8f715e0b0 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Fri, 25 Sep 2009 10:01:56 +0200
Subject: Fixed including of config.h.

If there is some option to modify libc behaviour (like if there was some
off_t usage to be modified by some flag to make that 64 bit) that
needs to be done before the first libc header. one could still do -D
there, though (unless cmake wants to do something automatically and puts
that in config.h)
---
 include/libssh/priv.h | 4 +++-
 libssh/kex.c          | 3 ++-
 libssh/misc.c         | 3 ++-
 libssh/packet.c       | 3 ++-
 libssh/poll.c         | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index cd43b72..0f57421 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -30,6 +30,8 @@
 #ifndef _LIBSSH_PRIV_H
 #define _LIBSSH_PRIV_H
 
+#include "config.h"
+
 #ifdef _MSC_VER
 #define snprintf _snprintf
 /** Imitate define of inttypes.h */
@@ -43,9 +45,9 @@
 #define PRIdS "zd"
 #endif
 
-#include "config.h"
 #include "libssh/libssh.h"
 #include "libssh/callback.h"
+
 /* some constants */
 #define MAX_PACKET_LEN 262144
 #define ERROR_BUFFERLEN 1024
diff --git a/libssh/kex.c b/libssh/kex.c
index ad2acc4..1d39901 100644
--- a/libssh/kex.c
+++ b/libssh/kex.c
@@ -21,6 +21,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -29,7 +31,6 @@
 #include <arpa/inet.h>
 #endif
 
-#include "config.h"
 #include "libssh/priv.h"
 #include "libssh/ssh2.h"
 #include "libssh/ssh1.h"
diff --git a/libssh/misc.c b/libssh/misc.c
index a08a629..bcc7906 100644
--- a/libssh/misc.c
+++ b/libssh/misc.c
@@ -22,6 +22,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
@@ -29,7 +31,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "config.h"
 
 #ifdef _WIN32
 #define _WIN32_IE 0x0501 //SHGetSpecialFolderPath
diff --git a/libssh/packet.c b/libssh/packet.c
index 7c7178c..7e25479 100644
--- a/libssh/packet.c
+++ b/libssh/packet.c
@@ -21,6 +21,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -30,7 +32,6 @@
 #include <arpa/inet.h>
 #endif
 
-#include "config.h"
 #include "libssh/priv.h"
 #include "libssh/ssh2.h"
 #include "libssh/ssh1.h"
diff --git a/libssh/poll.c b/libssh/poll.c
index 023a488..f757ee6 100644
--- a/libssh/poll.c
+++ b/libssh/poll.c
@@ -26,9 +26,10 @@
 
 /* This code is based on glib's gpoll */
 
+#include "config.h"
+
 #include <errno.h>
 
-#include "config.h"
 #include "libssh/priv.h"
 #include "libssh/libssh.h"
 #include "libssh/poll.h"
-- 
cgit