提交 8d95ca36 编写于 作者: M Mat 提交者: Rich Salz

Fix strdup macro redefinition

This fixes the following error when the CRT debug heap (crtdbg.h) is used:
e_os.h(476): warning C4005: 'strdup': macro redefinition
C:\Program Files (x86)\Windows Kits\10\Include\10.0.10586.0\ucrt\crtdbg.h(319): note: see previous definition of 'strdup'
Reviewed-by: NRichard Levitte <levitte@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1137)
上级 23049aa5
...@@ -473,7 +473,9 @@ struct servent *PASCAL getservbyname(const char *, const char *); ...@@ -473,7 +473,9 @@ struct servent *PASCAL getservbyname(const char *, const char *);
# define open _open # define open _open
# define fdopen _fdopen # define fdopen _fdopen
# define close _close # define close _close
# define strdup _strdup # ifndef strdup
# define strdup _strdup
# endif
# define unlink _unlink # define unlink _unlink
# endif # endif
# else # else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册