You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/10/17 16:35:49 UTC
svn commit: r1844128 -
/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch
Author: markt
Date: Wed Oct 17 16:35:49 2018
New Revision: 1844128
URL: http://svn.apache.org/viewvc?rev=1844128&view=rev
Log:
Simplify patch and get it working with 32-bit and 64-bit
Modified:
tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch
Modified: tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch?rev=1844128&r1=1844127&r2=1844128&view=diff
==============================================================================
--- tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch (original)
+++ tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt-1.1.1.patch Wed Oct 17 16:35:49 2018
@@ -77,36 +77,21 @@
if (!TEST_time_t_le(abs((int)difftime(time(NULL), default_time)),
--- e_os.h
+++ e_os.h
-@@ -148,8 +148,6 @@
- }
+@@ -149,7 +149,7 @@
# endif
# include <malloc.h>
--# if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
+ # if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
-# if _MSC_VER>=1300 && _MSC_VER<1600
++# ifdef _WIN64
# undef stdin
# undef stdout
# undef stderr
-@@ -157,23 +155,6 @@
+@@ -157,7 +157,7 @@
# define stdin (&__iob_func()[0])
# define stdout (&__iob_func()[1])
# define stderr (&__iob_func()[2])
-# elif _MSC_VER<1300 && defined(I_CAN_LIVE_WITH_LNK4049)
--# 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
- # include <io.h>
- # include <fcntl.h>
++# else
+ # undef stdin
+ # undef stdout
+ # undef stderr
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org