diff -u libssh2-1.4.2_morphos/src/libssh2_priv.h libssh2-1.4.2/src/libssh2_priv.h
--- libssh2-1.4.2_morphos/src/libssh2_priv.h	Sat Aug  4 18:40:16 2012
+++ libssh2-1.4.2/src/libssh2_priv.h	Thu Aug  9 15:12:58 2012
@@ -184,9 +184,9 @@
                       (channel), &(channel)->abstract)
 
 #define LIBSSH2_SEND_FD(session, fd, buffer, length, flags) \
-    session->send(fd, buffer, length, flags, &session->abstract)
+    session->cb_send(fd, buffer, length, flags, &session->abstract)
 #define LIBSSH2_RECV_FD(session, fd, buffer, length, flags) \
-    session->recv(fd, buffer, length, flags, &session->abstract)
+    session->cb_recv(fd, buffer, length, flags, &session->abstract)
 
 #define LIBSSH2_SEND(session, buffer, length, flags)  \
     LIBSSH2_SEND_FD(session, session->socket_fd, buffer, length, flags)
@@ -561,8 +561,8 @@
       LIBSSH2_DISCONNECT_FUNC((*ssh_msg_disconnect));
       LIBSSH2_MACERROR_FUNC((*macerror));
       LIBSSH2_X11_OPEN_FUNC((*x11));
-      LIBSSH2_SEND_FUNC((*send));
-      LIBSSH2_RECV_FUNC((*recv));
+      LIBSSH2_SEND_FUNC((*cb_send));
+      LIBSSH2_RECV_FUNC((*cb_recv));
 
     /* Method preferences -- NULL yields "load order" */
     char *kex_prefs;
diff -u libssh2-1.4.2_morphos/src/session.c libssh2-1.4.2/src/session.c
--- libssh2-1.4.2_morphos/src/session.c	Sat Aug  4 18:15:13 2012
+++ libssh2-1.4.2/src/session.c	Thu Aug  9 15:17:04 2012
@@ -503,8 +503,8 @@
         session->alloc = local_alloc;
         session->free = local_free;
         session->realloc = local_realloc;
-        session->send = _libssh2_send;
-        session->recv = _libssh2_recv;
+        session->cb_send = _libssh2_send;
+        session->cb_recv = _libssh2_recv;
         session->abstract = abstract;
         session->api_timeout = 0; /* timeout-free API by default */
         session->api_block_mode = 1; /* blocking API by default */
@@ -557,13 +557,13 @@
         return oldcb;
 
     case LIBSSH2_CALLBACK_SEND:
-        oldcb = session->send;
-        session->send = callback;
+        oldcb = session->cb_send;
+        session->cb_send = callback;
         return oldcb;
 
     case LIBSSH2_CALLBACK_RECV:
-        oldcb = session->recv;
-        session->recv = callback;
+        oldcb = session->cb_recv;
+        session->cb_recv = callback;
         return oldcb;
     }
     _libssh2_debug(session, LIBSSH2_TRACE_TRANS, "Setting Callback %d", cbtype);