From: Richard Levitte <levitte@openssl.org>
Date: Thu, 8 Jul 2004 08:32:48 +0000 (+0000)
Subject: o_str.c: Windows doesn't have <strings.h>, and since we use _strnicmp() and
X-Git-Tag: BEN_FIPS_TEST_6~14^2~174
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dc56eb507997848532be954a658e3a6136e908a3;p=oweals%2Fopenssl.git

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 42b25d078f..7189d13352 100644
--- 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 744a6e27d3..4a70a9e00b 100644
--- 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);