Changeset 101634 in vbox

Timestamp:

Oct 27, 2023 3:27:36 PM (11 months ago)

Author:

vboxsync

Message:

libssh: removing 0.9.6 mention from Config.kmk and build fix. bugref:10539

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Network/DrvCloudTunnel.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -5136 +5136 @@
 ifdef VBOX_WITH_LIBSSH
  SDK_VBoxLibSsh                := libssh for dynamic dll loading with assembly stubs.
- SDK_VBoxLibSsh_INCS           ?= $(PATH_ROOT)/src/libs/libssh-0.9.6/include
+ SDK_VBoxLibSsh_INCS           ?= $(PATH_ROOT)/src/libs/libssh-0.10.5/include
  # SDK_VBoxLibSsh_LIBS is not defined, as VBoxLibSsh dll is not linked, but loaded explicitly
  # by auto-generated stub code (lazy loading)

trunk/src/VBox/Devices/Network/DrvCloudTunnel.cpp

@@ -755 +755 @@
 }
 
+#ifdef WIN32
+static int channelWriteWontblockCallback(ssh_session, ssh_channel, unsigned int, void *)
+#else
 static int channelWriteWontblockCallback(ssh_session, ssh_channel, size_t, void *)
+#endif
 {
     return 0;