The branch master has been updated
via ab98861e919b8f8f7fee3f2d44ef3b4b05908a25 (commit)
from 2625807aff370830b55c0fb71b63357e8523733e (commit)
- Log -----------------------------------------------------------------
commit ab98861e919b8f8f7fee3f2d44ef3b4b05908a25
Author: Tanzinul Islam <tanzinul.is...@gmail.com>
Date: Sat Jul 31 18:28:34 2021 +0100
Redefine getpid() -> _getpid() only for MSVC
This was introduced in 814b5133e for MSVC. C++Builder doesn't need it.
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Matthias St. Pierre <matthias.st.pie...@ncp-e.com>
Reviewed-by: Dmitry Belyavskiy <beld...@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/16192)
-----------------------------------------------------------------------
Summary of changes:
apps/lib/s_socket.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c
index 6884fd86cd..dbeebb54c5 100644
--- a/apps/lib/s_socket.c
+++ b/apps/lib/s_socket.c
@@ -27,12 +27,12 @@ typedef unsigned int u_int;
#endif
#ifdef _WIN32
-/*
- * With MSVC, certain POSIX functions have been renamed to have an underscore
- * prefix.
- */
# include <process.h>
-# define getpid _getpid
+
+/* MSVC renamed some POSIX functions to have an underscore prefix. */
+# ifdef _MSC_VER
+# define getpid _getpid
+# endif
#endif
#ifndef OPENSSL_NO_SOCK
