projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mingw warnings.
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index
b8a7e35
..
a969479
100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-452,7
+452,10
@@
static unsigned int _strlen31(const char *str)
# if defined(_WIN32_WCE) && _WIN32_WCE<410
# define getservbyname _masked_declaration_getservbyname
# endif
# if defined(_WIN32_WCE) && _WIN32_WCE<410
# define getservbyname _masked_declaration_getservbyname
# endif
-# include <winsock.h>
+# if !defined(IPPROTO_IP)
+ /* winsock[2].h was included already? */
+# include <winsock.h>
+# endif
# ifdef getservbyname
# undef getservbyname
/* this is used to be wcecompat/include/winsock_extras.h */
# ifdef getservbyname
# undef getservbyname
/* this is used to be wcecompat/include/winsock_extras.h */