summaryrefslogtreecommitdiffstats
path: root/libvncserver
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2011-03-17 14:43:55 +0100
committerChristian Beier <dontmind@freeshell.org>2011-03-17 14:43:55 +0100
commitfe1ca16e9b75b5f38ab374c8dfff92d2c3ea4532 (patch)
tree8539521ed668d65f6dbd59c491bc9565bce6e8cb /libvncserver
parent56234cd0b656de3c8827288f2adf78c9cb12d0c5 (diff)
downloadlibtdevnc-fe1ca16e9b75b5f38ab374c8dfff92d2c3ea4532.tar.gz
libtdevnc-fe1ca16e9b75b5f38ab374c8dfff92d2c3ea4532.zip
Fix (most) MinGW32 compiler warnings.
Diffstat (limited to 'libvncserver')
-rw-r--r--libvncserver/rfbserver.c4
-rw-r--r--libvncserver/ultra.c4
2 files changed, 4 insertions, 4 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");
}
}
diff --git a/libvncserver/ultra.c b/libvncserver/ultra.c
index 9a3b14f..47fab55 100644
--- a/libvncserver/ultra.c
+++ b/libvncserver/ultra.c
@@ -50,7 +50,7 @@ rfbSendOneRectEncodingUltra(rfbClientPtr cl,
+ (x * (cl->scaledScreen->bitsPerPixel / 8)));
int maxRawSize;
- int maxCompSize;
+ lzo_uint maxCompSize;
maxRawSize = (w * h * (cl->format.bitsPerPixel / 8));
@@ -92,7 +92,7 @@ rfbSendOneRectEncodingUltra(rfbClientPtr cl,
}
/* Perform the compression here. */
- deflateResult = lzo1x_1_compress((unsigned char *)cl->beforeEncBuf, (lzo_uint)(w * h * (cl->format.bitsPerPixel / 8)), (unsigned char *)cl->afterEncBuf, (lzo_uint *)&maxCompSize, cl->lzoWrkMem);
+ deflateResult = lzo1x_1_compress((unsigned char *)cl->beforeEncBuf, (lzo_uint)(w * h * (cl->format.bitsPerPixel / 8)), (unsigned char *)cl->afterEncBuf, &maxCompSize, cl->lzoWrkMem);
/* maxCompSize now contains the compressed size */
/* Find the total size of the resulting compressed data. */