[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  814b5133e9aca90f1edb99c38a26e55cd7e50e19 (commit)
      from  baa47ad3b13eea1152e3773b606964f7bd87a720 (commit)


- Log -----------------------------------------------------------------
commit 814b5133e9aca90f1edb99c38a26e55cd7e50e19
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jun 11 04:55:03 2021 +0200

    apps/lib/s_socket.c: Alias getpid with _getpid for _WIN32
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15710)

-----------------------------------------------------------------------

Summary of changes:
 apps/lib/s_socket.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c
index 36dbe615d2..bddf16045f 100644
--- a/apps/lib/s_socket.c
+++ b/apps/lib/s_socket.c
@@ -26,6 +26,15 @@
 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
+#endif
+
 #ifndef OPENSSL_NO_SOCK
 
 # include "apps.h"