diff options
| author | Mat <mberchtold@gmail.com> | 2016-05-27 19:35:12 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-05-30 15:51:31 +0200 |
| commit | 8d95ca36e66a5183e1f2c6c7a74044ee3793abc4 (patch) | |
| tree | 0c158f722976d5def5cfc68a3431166d6d4d3dc0 /e_os.h | |
| parent | perl: use the 'if' module to conditionally load File::Glob (diff) | |
| download | openssl-8d95ca36e66a5183e1f2c6c7a74044ee3793abc4.tar.xz openssl-8d95ca36e66a5183e1f2c6c7a74044ee3793abc4.zip | |
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)
Diffstat (limited to 'e_os.h')
| -rw-r--r-- | e_os.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -473,7 +473,9 @@ struct servent *PASCAL getservbyname(const char *, const char *); # define open _open # define fdopen _fdopen # define close _close -# define strdup _strdup +# ifndef strdup +# define strdup _strdup +# endif # define unlink _unlink # endif # else |