From: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu, 19 Sep 2013 18:30:03 +0000 (-0500)
Subject: Include string.h where needed
X-Git-Tag: v5.02~29
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dadcec975ef3db4cb8fa10081f02a5e9538e13d5;p=users%2Fdwmw2%2Fopenconnect.git

Include string.h where needed

This fixes the Solaris build; reported by "Rodney".

Also clean up #includes in compat.c; there's no need for them to be
hidden within the various ifdef blocks. Leave <sys/time.h> where it was,
just in case it's problematic on some platform. The rest are already
included unconditionally in other files, so should be fine.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/compat.c b/compat.c
index 315cfb3d..acb97d6b 100644
--- a/compat.c
+++ b/compat.c
@@ -22,6 +22,11 @@
  *   Boston, MA 02110-1301 USA
  */
 
+#include <string.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <ctype.h>
+
 #include "openconnect-internal.h"
 
 #ifdef __sun__
@@ -38,8 +43,6 @@ time_t openconnect__time(time_t *t)
 #endif
 
 #ifndef HAVE_ASPRINTF
-#include <stdarg.h>
-#include <errno.h>
 
 static int oc_vasprintf(char **strp, const char *fmt, va_list ap)
 {
@@ -142,7 +145,6 @@ ssize_t openconnect__getline(char **lineptr, size_t *n, FILE *stream)
 #endif
 
 #ifndef HAVE_STRCASESTR
-#include <ctype.h>
 
 char *openconnect__strcasestr(const char *haystack, const char *needle)
 {
diff --git a/openssl.c b/openssl.c
index 5e2a94ea..a395bc53 100644
--- a/openssl.c
+++ b/openssl.c
@@ -23,6 +23,7 @@
  */
 
 #include <errno.h>
+#include <string.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/www/changelog.xml b/www/changelog.xml
index 229e5d23..55193bee 100644
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -17,6 +17,7 @@
 <ul>
    <li><b>OpenConnect HEAD</b>
      <ul>
+       <li>Fix Solaris build breakage due to missing <tt>&amp;lt;string.h&amp;gt;</tt> includes.</li>
        <li>Include path in <tt>&amp;lt;group-access&amp;gt;</tt> node.</li>
      </ul><br/>
   </li>