This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new b62853fb1 Restore 1.1.1 code in an effort to fix build for Windows
b62853fb1 is described below
commit b62853fb1d26e1ec8d183490cd0b3c688c7319e5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 15 17:04:18 2022 +0100
Restore 1.1.1 code in an effort to fix build for Windows
---
native/srclib/openssl/openssl-msvcrt-3.0.3.patch | 28 +++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/native/srclib/openssl/openssl-msvcrt-3.0.3.patch
b/native/srclib/openssl/openssl-msvcrt-3.0.3.patch
index 1e2ef4d48..5b73397d9 100644
--- a/native/srclib/openssl/openssl-msvcrt-3.0.3.patch
+++ b/native/srclib/openssl/openssl-msvcrt-3.0.3.patch
@@ -1,8 +1,8 @@
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index a7294d2ad1..24c887f8d3 100644
+index 66bc81dfb4..52345e4f33 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
-@@ -1361,7 +1361,7 @@ my %targets = (
+@@ -1369,7 +1369,7 @@ my %targets = (
# prefer [non-debug] openssl.exe to be free from Micorosoft RTL
# redistributable.
bin_cflags => add(picker(debug => "/MDd",
@@ -39,7 +39,7 @@ index 23ffe16245..cd448e5483 100644
ts = gmtime(timer);
if (ts == NULL)
diff --git a/e_os.h b/e_os.h
-index 514de967a9..49b68d10a3 100644
+index 9e2f14072f..70ef508971 100644
--- a/e_os.h
+++ b/e_os.h
@@ -139,7 +139,7 @@ static __inline unsigned int _strlen31(const char *str)
@@ -51,6 +51,28 @@ index 514de967a9..49b68d10a3 100644
# undef stdin
# undef stdout
# undef stderr
+@@ -147,6 +147,21 @@ FILE *__iob_func();
+ # define stdin (&__iob_func()[0])
+ # define stdout (&__iob_func()[1])
+ # define stderr (&__iob_func()[2])
++# else
++# undef stdin
++# undef stdout
++# undef stderr
++ /*
++ * pre-1300 has __p__iob(), but it's available only in msvcrt.lib,
++ * or in other words with /MD. Declaring implicit import, i.e. with
++ * _imp_ prefix, works correctly with all compiler options, but
++ * without /MD results in LINK warning LNK4049: 'locally defined
++ * symbol "__iob" imported'.
++ */
++extern FILE *_imp___iob;
++# define stdin (&_imp___iob[0])
++# define stdout (&_imp___iob[1])
++# define stderr (&_imp___iob[2])
+ # endif
+ # endif
+ # endif
diff --git a/engines/e_capi.c b/engines/e_capi.c
index 6f223a6922..045d1368fd 100644
--- a/engines/e_capi.c
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
