summaryrefslogtreecommitdiffstats
path: root/libvncserver/rfbserver.c
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2011-03-28 15:13:29 +0200
committerChristian Beier <dontmind@freeshell.org>2011-03-28 15:13:29 +0200
commit471baea920773e3080b7972b93dbe091ebe3b4e0 (patch)
treef29897c140230af1ce95943baa18b89d664b8ba3 /libvncserver/rfbserver.c
parent64daa71ede302d4d0ba4174b3dcec49bf2588111 (diff)
parent62b7acf48009cfad1a54bd8ba04b662f9ac53c80 (diff)
downloadlibtdevnc-471baea920773e3080b7972b93dbe091ebe3b4e0.tar.gz
libtdevnc-471baea920773e3080b7972b93dbe091ebe3b4e0.zip
Merge branch 'master' of ssh://libvncserver.git.sourceforge.net/gitroot/libvncserver/libvncserver
Diffstat (limited to 'libvncserver/rfbserver.c')
-rw-r--r--libvncserver/rfbserver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
index 73be34c..70ae88b 100644
--- a/libvncserver/rfbserver.c
+++ b/libvncserver/rfbserver.c
@@ -1657,7 +1657,7 @@ rfbBool rfbProcessFileTransfer(rfbClientPtr cl, uint8_t contentType, uint8_t con
#ifdef LIBVNCSERVER_HAVE_LIBZ
/* compressed packet */
nRet = uncompress(compBuff,&nRawBytes,(const unsigned char*)buffer, length);
- retval=write(cl->fileTransfer.fd, compBuff, nRawBytes);
+ retval=write(cl->fileTransfer.fd, (char*)compBuff, nRawBytes);
#else
/* Write the file out as received... */
retval=write(cl->fileTransfer.fd, buffer, length);
@@ -3265,7 +3265,7 @@ void
rfbNewUDPConnection(rfbScreenInfoPtr rfbScreen,
int sock)
{
- if (write(sock, &ptrAcceleration, 1) < 0) {
+ if (write(sock, (char*) &ptrAcceleration, 1) < 0) {
rfbLogPerror("rfbNewUDPConnection: write");
}
}