o_str.c: Windows doesn't have <strings.h>, and since we use _strnicmp() and

_stricmp() on that platform, use the appropriate header file for it,
<string.h>.
o_str.h: we only want to get size_t, which is defined in <stddef.h>.

Philippe Bougeret <philippe.bougeret@freesbee.fr> notified us about Windows
not having a <strings.h>

diff --git a/crypto/o_str.c b/crypto/o_str.c
index 42b25d078f8dbed3ae83f8b59dba408164941373..7189d13352ee17cd8ff5ac213c98265d5f09ac06 100644 (file)
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -57,9 +57,13 @@
  */
 
 #include <ctype.h>
-#include <strings.h>
-#include "o_str.h"
 #include <openssl/e_os2.h>
+#ifdef OPENSSL_SYS_WINDOWS
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+#include "o_str.h"
 
 #undef strncasecmp
 #undef strcasecmp

diff --git a/crypto/o_str.h b/crypto/o_str.h
index 744a6e27d39ae912dc0af5f6af559fe5910bf2e4..4a70a9e00badda552abefd382ca964c3bf2c74c0 100644 (file)
--- a/crypto/o_str.h
+++ b/crypto/o_str.h
@@ -59,7 +59,7 @@
 #ifndef HEADER_O_STR_H
 #define HEADER_O_STR_H
 
-#include <string.h>
+#include <stddef.h>            /* to get size_t */
 
 int OPENSSL_strcasecmp(const char *str1, const char *str2);
 int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n);