commit 8d95ca36e66a5183e1f2c6c7a74044ee3793abc4
author Mat <mberchtold@gmail.com> Fri May 27 19:35:12 2016 +0200
committer Rich Salz <rsalz@openssl.org> Mon May 30 09:51:31 2016 -0400
tree 0c158f722976d5def5cfc68a3431166d6d4d3dc0
parent 23049aa52e2b4f12c2c2d7c7d80f5b1876a1b8ba

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)

e_os.h

diff --git a/e_os.h b/e_os.h
index 700d7d0..4951335 100644
--- a/e_os.h
+++ b/e_os.h
@@ -473,7 +473,9 @@
 #   define open _open
 #   define fdopen _fdopen
 #   define close _close
-#   define strdup _strdup
+#   ifndef strdup
+#    define strdup _strdup
+#   endif
 #   define unlink _unlink
 #  endif
 # else