--- a/packages/net/vnc_server/current/ChangeLog
+++ b/packages/net/vnc_server/current/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-30  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* include/vnc-server.h (vnc_printf_return_t): removed ununsed char
+	member from structure.
+	* tests/vnc-test.c (main): Correct the declaration of main.
+
 2005-03-27  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* tests/vnc-test.c: main() added function parmeters to stop gcc

--- a/packages/net/vnc_server/current/include/vnc-server.h
+++ b/packages/net/vnc_server/current/include/vnc-server.h
@@ -89,7 +89,6 @@ typedef struct {
 /* Type to hold rectangle size details */
 typedef struct
 {
-    int chars;
     cyg_uint16 width;
     cyg_uint16 height;
 } vnc_printf_return_t;

--- a/packages/net/vnc_server/current/src/vnc-server.c
+++ b/packages/net/vnc_server/current/src/vnc-server.c
@@ -327,7 +327,7 @@ static void client_handler(void *data)
     int server_sock;                /* Socket descriptor for server */
     struct sockaddr_in server_addr; /* Details of my IP address and port */
     struct sockaddr_in client_addr; /* Details of new connection IP address */
-    int client_addr_size;
+    socklen_t client_addr_size;
 
     int i, j;
     long int temp_long;
@@ -785,7 +785,7 @@ static void client_handler(void *data)
 
 #ifdef CYGPKG_VNC_SERVER_BUILD_KEYBOARD_DRIVER
                 /* Call the keyboard handle function */
-                vnc_kbd_handler(&(message_buffer[0]));
+                vnc_kbd_handler((unsigned char *)&(message_buffer[0]));
 #endif
                 break;
 
@@ -802,7 +802,7 @@ static void client_handler(void *data)
 
 #ifdef CYGPKG_VNC_SERVER_BUILD_MOUSE_DRIVER
                 /* Called the mouse handler function */
-                vnc_mouse_handler(&(message_buffer[0]));
+                vnc_mouse_handler((unsigned char *)&(message_buffer[0]));
 #endif
                 break;
 

--- a/packages/net/vnc_server/current/tests/vnc-test.c
+++ b/packages/net/vnc_server/current/tests/vnc-test.c
@@ -35,7 +35,7 @@ void HideCursor(void);
 int cursor_x, cursor_y;  /* Cursor position */
 vnc_frame_format_t *display_info;  /* Display Info */
 
-int main(int argc, char * argv)
+int main(int argc, char * argv[])
 {
     int mouse_handle = -1;
     int kbd_handle = -1;