--- sourceforge.net/trunk/rdesktop/xclip.c	2005/06/27 12:18:48	913
+++ sourceforge.net/trunk/rdesktop/xclip.c	2005/08/02 09:27:46	942
@@ -104,6 +104,7 @@
 	XSendEvent(g_display, req->requestor, False, NoEventMask, &xev);
 }
 
+#ifndef MAKE_PROTO
 void
 xclip_handle_SelectionNotify(XSelectionEvent * event)
 {
@@ -191,7 +192,7 @@
 			translated_data = lf2crlf(data, &length);
 
 			g_clip_buffer = (uint8 *) xmalloc(length);
-			strncpy(g_clip_buffer, translated_data, length);
+			strncpy((char *) g_clip_buffer, (char *) translated_data, length);
 			xfree(translated_data);
 			g_clip_buflen = length;
 
@@ -321,15 +322,16 @@
 		{
 			uint8 *translated_data;
 			uint32 length = nitems;
+			uint8 *tmp;
 
 			DEBUG_CLIPBOARD(("Translating linebreaks before sending data\n"));
 			translated_data = lf2crlf(data, &length);
 
-			uint8 *tmp = xmalloc(length + g_clip_buflen);
-			strncpy(tmp, g_clip_buffer, g_clip_buflen);
+			tmp = xmalloc(length + g_clip_buflen);
+			strncpy((char *) tmp, (char *) g_clip_buffer, g_clip_buflen);
 			xfree(g_clip_buffer);
 
-			strncpy(tmp + g_clip_buflen, translated_data, length);
+			strncpy((char *) (tmp + g_clip_buflen), (char *) translated_data, length);
 			xfree(translated_data);
 
 			g_clip_buffer = tmp;
@@ -365,6 +367,7 @@
 	cliprdr_send_text_format_announce();
 	rdesktop_is_selection_owner = 0;
 }
+#endif
 
 
 void