--- lib/libxview/server/server.c.orig	Sun Jun 26 20:53:40 1994
+++ lib/libxview/server/server.c	Wed Aug  4 18:03:21 2010
@@ -24,7 +24,7 @@ static char     sccsid[] = "@(#)server.c 20.157 93/04/
 #include <xview/notify.h>
 #include <xview/win_notify.h>
 #include <xview/defaults.h>
-#include <X11/Xlib.h>
+#include <X11/Xlibint.h>
 #include <xview_private/portable.h>
 #include <xview_private/svr_atom.h>
 #include <xview_private/svr_impl.h>
@@ -65,6 +65,7 @@ static Notify_value 	 scheduler();
 static unsigned int 	 string_to_modmask();
 static Server_atom_type  save_atom();
 static void 		 server_yield_modifiers();
+static int		 xv_set_scheduler();
 
 Xv_private char		*xv_strtok();
 
@@ -440,7 +441,7 @@ server_init(parent, server_public, avlist)
   	/* lumpi@dobag.in-berlin.de */
     if (XrmGetDatabase((Display *)server->xdisplay)) {
 	server->db = XrmGetStringDatabase(
-				(XrmGetDatabase((Display *)server->xdisplay)));
+				(char *) (XrmGetDatabase((Display *)server->xdisplay)));
 #else
     if (((Display *)server->xdisplay)->xdefaults) {
 	server->db = XrmGetStringDatabase(
@@ -741,10 +742,7 @@ server_init(parent, server_public, avlist)
      */
 
     /* Used by atom mgr */
-    server->atom_mgr[ATOM] = (XID) XAllocID((Display *)server->xdisplay);
-    server->atom_mgr[NAME] = (XID) XAllocID((Display *)server->xdisplay);
-    server->atom_mgr[TYPE] = (XID) XAllocID((Display *)server->xdisplay);
-    server->atom_mgr[DATA] = (XID) XAllocID((Display *)server->xdisplay);
+    XAllocIDs((Display *)server->xdisplay, server->atom_mgr, sizeof(server->atom_mgr) / sizeof(*server->atom_mgr));
 
     /* Key for XV_KEY_DATA.  Used in local dnd ops. */
     server->dnd_ack_key = xv_unique_key();
