Changeset 83762 in vbox for trunk

Timestamp:

Apr 17, 2020 3:20:27 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137283

Message:

openssl: VC++ 14.1 build tweaking. bugref:8489

Location:

trunk/src/libs/openssl-1.1.1f

Files:

• crypto/async/async_local.h (modified) (1 diff)
• crypto/rand/rand_win.c (modified) (1 diff)
• crypto/rand/randfile.c (modified) (1 diff)
• e_os.h (modified) (1 diff)

trunk/src/libs/openssl-1.1.1f/crypto/async/async_local.h

@@ -18 +18 @@
 
 #if defined(_WIN32)
+# ifdef VBOX
+#  include <iprt/win/windows.h>
+# else
 # include <windows.h>
+# endif
 #endif
 

trunk/src/libs/openssl-1.1.1f/crypto/rand/rand_win.c

@@ -18 +18 @@
 # endif
 
+# ifdef VBOX
+#  include <iprt/win/windows.h>
+# else
 # include <windows.h>
+# endif
 /* On Windows Vista or higher use BCrypt instead of the legacy CryptoAPI */
 # if defined(_MSC_VER) && _MSC_VER > 1500 /* 1500 = Visual Studio 2008 */ \

trunk/src/libs/openssl-1.1.1f/crypto/rand/randfile.c

@@ -28 +28 @@
 # include <fcntl.h>
 # ifdef _WIN32
+#  ifdef VBOX
+#   include <iprt/win/windows.h>
+#  else
 #  include <windows.h>
+#  endif
 #  include <io.h>
 #  define stat    _stat

trunk/src/libs/openssl-1.1.1f/e_os.h

@@ -154 +154 @@
         * at run-time [DSO_global_lookup is recommended]...
         */
+#    ifdef VBOX
+#     include <iprt/win/winsock2.h>
+#     include <iprt/win/ws2tcpip.h>
+#    else
 #    include <winsock2.h>
 #    include <ws2tcpip.h>
+#    endif
        /* yes, they have to be #included prior to <windows.h> */
 #   endif
+#   ifdef VBOX
+#    include <iprt/win/windows.h>
+#   else
 #   include <windows.h>
+#   endif
 #   endif                   /* bird */
 #   include <stdio.h>