Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0

This commit is contained in:
Marc-André Moreau 2011-07-11 15:58:50 -04:00
commit e38ad39ef0
3 changed files with 6 additions and 4 deletions

View File

@ -24,6 +24,7 @@ set(FREERDP_CHANMAN_SRCS
add_library(freerdp-chanman SHARED ${FREERDP_CHANMAN_SRCS})
set_target_properties(freerdp-chanman PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION})
target_link_libraries(freerdp-chanman freerdp-utils)
install(TARGETS freerdp-chanman DESTINATION lib)

View File

@ -25,6 +25,11 @@
#include <freerdp/settings.h>
#include <freerdp/utils/stream.h>
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
#endif
typedef struct rdp_tcp rdpTcp;
typedef boolean (*TcpConnect) (rdpTcp* tcp, const uint8* hostname, uint16 port);
typedef boolean (*TcpDisconnect) (rdpTcp* tcp);

View File

@ -33,10 +33,6 @@
#include "credssp.h"
#include "transport.h"
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
#endif
#define BUFFER_SIZE 16384
STREAM* transport_recv_stream_init(rdpTransport* transport, int size)