root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1137)
This commit is contained in:
Mat 2016-05-27 19:35:12 +02:00 committed by Rich Salz
parent 23049aa52e
commit 8d95ca36e6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e_os.h
View File

@ -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