diff options
| author | Richard Levitte <levitte@openssl.org> | 2004-07-08 08:32:48 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2004-07-08 08:32:48 +0000 |
| commit | dc56eb507997848532be954a658e3a6136e908a3 (patch) | |
| tree | 1b76d1dd10884424daf8719edcc7eb399670ca50 | |
| parent | 637ff35ef6a545c1e6caf4c6675bf2e1ee33da99 (diff) | |
| download | openssl-new-dc56eb507997848532be954a658e3a6136e908a3.tar.gz | |
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>
| -rw-r--r-- | crypto/o_str.c | 8 | ||||
| -rw-r--r-- | crypto/o_str.h | 2 |
2 files changed, 7 insertions, 3 deletions
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); |