Add sys/uio.h for FBSD builds and remove old stdio references

README

@@ -10,6 +10,10 @@ Version 0.8
 
   Swapped order of none,zlib compression modes to prefer no compression by default.
 
+  Added sys/uio.h for platforms (FBSD) which need it in order to define struct iovec.
+
+  Removed unnecessary inclusion of stdio.h (holdover from debugging)
+
 Version 0.7
 -----------
 

configure.in

@@ -162,7 +162,7 @@ fi
 
 # Checks for header files.
 # AC_HEADER_STDC
-AC_CHECK_HEADERS([errno.h fcntl.h stdio.h stdlib.h unistd.h])
+AC_CHECK_HEADERS([errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

include/libssh2_config.h.in

@@ -33,6 +33,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#undef HAVE_SYS_UIO_H
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 

src/hostkey.c

@@ -40,6 +40,11 @@
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 
+/* Needed for struct iovec on some platforms */
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
 #ifndef OPENSSL_NO_RSA
 /* ***********
    * ssh-rsa *

src/packet.c

@@ -44,6 +44,10 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 
+/* Needed for struct iovec on some platforms */
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
 
 /* {{{ libssh2_packet_queue_listener
  * Queue a connection request for a listener

src/scp.c

@@ -37,7 +37,6 @@
 
 #include "libssh2_priv.h"
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #define LIBSSH2_SCP_RESPONSE_BUFLEN		256

src/userauth.c

@@ -36,7 +36,12 @@
  */
 
 #include "libssh2_priv.h"
-#include <stdio.h>
+
+/* Needed for struct iovec on some platforms */
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
 
 /* {{{ proto libssh2_userauth_list
  * List authentication methods