summaryrefslogtreecommitdiffstats
path: root/e_os.h
diff options
context:
space:
mode:
authorMat <mberchtold@gmail.com>2016-05-27 19:35:12 +0200
committerRich Salz <rsalz@openssl.org>2016-05-30 09:51:31 -0400
commit8d95ca36e66a5183e1f2c6c7a74044ee3793abc4 (patch)
tree0c158f722976d5def5cfc68a3431166d6d4d3dc0 /e_os.h
parent23049aa52e2b4f12c2c2d7c7d80f5b1876a1b8ba (diff)
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.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/e_os.h b/e_os.h
index 700d7d05ce..4951335635 100644
--- a/e_os.h
+++ b/e_os.h
@@ -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