From 603b5667b64aa5aaea0aa7e575fb4cb2c2b6d7c7 Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Mon, 20 Feb 2006 19:19:30 +0000
Subject:  fix some non-gcc compiler warnings and signals in x11vnc

---
 libvncserver/cursor.c                                          | 2 +-
 libvncserver/main.c                                            | 1 +
 libvncserver/tightvnc-filetransfer/filelistinfo.c              | 3 +++
 libvncserver/tightvnc-filetransfer/filetransfermsg.c           | 3 +++
 libvncserver/tightvnc-filetransfer/handlefiletransferrequest.c | 3 +++
 5 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'libvncserver')

diff --git a/libvncserver/cursor.c b/libvncserver/cursor.c
index eb976e2..d40fb76 100644
--- a/libvncserver/cursor.c
+++ b/libvncserver/cursor.c
@@ -341,7 +341,7 @@ char* rfbMakeMaskFromAlphaSource(int width,int height,unsigned char* alphaSource
 			}
 		}
 	free(error);
-	return result;
+	return (char *) result;
 }
 
 void rfbFreeCursor(rfbCursorPtr cursor)
diff --git a/libvncserver/main.c b/libvncserver/main.c
index 00b71be..ada1a7a 100644
--- a/libvncserver/main.c
+++ b/libvncserver/main.c
@@ -400,6 +400,7 @@ clientOutput(void *data)
 	sraRgnDestroy(updateRegion);
     }
 
+    /* Not reached. */
     return NULL;
 }
 
diff --git a/libvncserver/tightvnc-filetransfer/filelistinfo.c b/libvncserver/tightvnc-filetransfer/filelistinfo.c
index 8b482a1..c08e506 100644
--- a/libvncserver/tightvnc-filetransfer/filelistinfo.c
+++ b/libvncserver/tightvnc-filetransfer/filelistinfo.c
@@ -42,6 +42,9 @@ DisplayFileList(FileListInfo fli)
     rfbLog("DISPLAYING FILE NAMES IN THE LIST ...END\n\n");
 }
 
+#ifndef __GNUC__
+#define __FUNCTION__ "unknown"
+#endif
 
 int 
 AddFileListItemInfo(FileListInfoPtr fileListInfoPtr, char* name, 
diff --git a/libvncserver/tightvnc-filetransfer/filetransfermsg.c b/libvncserver/tightvnc-filetransfer/filetransfermsg.c
index a51181f..7dae2cd 100644
--- a/libvncserver/tightvnc-filetransfer/filetransfermsg.c
+++ b/libvncserver/tightvnc-filetransfer/filetransfermsg.c
@@ -100,6 +100,9 @@ GetFileListResponseMsg(char* path, char flags)
 	return fileListMsg;
 }
 
+#ifndef __GNUC__
+#define __FUNCTION__ "unknown"
+#endif
 
 int
 CreateFileListInfo(FileListInfoPtr pFileListInfo, char* path, int flag)
diff --git a/libvncserver/tightvnc-filetransfer/handlefiletransferrequest.c b/libvncserver/tightvnc-filetransfer/handlefiletransferrequest.c
index 9def149..2b9c3b2 100644
--- a/libvncserver/tightvnc-filetransfer/handlefiletransferrequest.c
+++ b/libvncserver/tightvnc-filetransfer/handlefiletransferrequest.c
@@ -84,6 +84,9 @@ InitFileTransfer()
 	fileTransferInitted = TRUE;
 }
 
+#ifndef __GNUC__
+#define __FUNCTION__ "unknown"
+#endif
 
 /*
  *  This method is called from InitFileTransfer method and
-- 
cgit v1.2.3