Skip to content

Commit

Permalink
Fix strdup macro redefinition
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from openssl#1137)
  • Loading branch information
matbech authored and Rich Salz committed May 30, 2016
1 parent 23049aa commit 8d95ca3
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion e_os.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8d95ca3

Please sign in to comment.