--- ddxli.h	1999-10-25 04:14:53.000000000 +0200
+++ ddxli.h	2005-09-08 12:07:33.948259924 +0200
@@ -14,7 +14,7 @@
 #include <sys/shm.h>
 #include <X11/extensions/XShm.h>
 
-#if defined(SYSV) || defined(VMS)
+#if defined(SYSV) || defined(VMS) || defined __GLIBC__
 #include <string.h>
 #ifndef index			/* some SysV's do this for you */
 #define index strchr
--- Imakefile	2005-09-05 07:01:30.000000000 +0200
+++ Imakefile	2005-09-08 12:07:33.931258518 +0200
@@ -9,7 +9,7 @@
 # -DHAVE_BOOLEAN  if your system declares 'boolean' somewhere
 # -DHAVE_BUNZIP2  if you have bzip2 and want to handle .bz2 files
 
-#ifdef HPArchitecture
+#if defined(HPArchitecture) && !defined(LinuxArchitecture)
       CCOPTIONS = -Aa -D_HPUX_SOURCE
 #endif
 
@@ -38,8 +38,8 @@
 
 install:: $(SYSPATHFILE)
 	$(RM) $(BINDIR)/xview $(BINDIR)/xsetbg
-	$(LN) $(BINDIR)/xli $(BINDIR)/xview
-	$(LN) $(BINDIR)/xli $(BINDIR)/xsetbg
+	$(LN) xli $(BINDIR)/xview
+	$(LN) xli $(BINDIR)/xsetbg
 
 $(SYSPATHFILE):
 	@echo "*** Creating default $(SYSPATHFILE) since you"
--- root.c	2005-09-05 07:01:30.000000000 +0200
+++ root.c	2005-09-08 12:07:34.013265302 +0200
@@ -55,8 +55,8 @@
 	Pixmap *pm;
 	Atom actual_type;	/* NOTUSED */
 	int format;
-	int nitems;
-	int bytes_after;
+       unsigned long	nitems;
+       unsigned long	bytes_after;
 
 	/* intern the property name */
 	Atom atom = XInternAtom(dpy, RETAIN_PROP_NAME, 0);
@@ -64,8 +64,7 @@
 	/* look for existing resource allocation */
 	if ((XGetWindowProperty(dpy, w, atom, 0, 1, 1 /*delete */ ,
 				AnyPropertyType, &actual_type, &format,
-				(unsigned long *) &nitems,
-				(unsigned long *) &bytes_after,
+			  &nitems, &bytes_after,
 				(unsigned char **) &pm) == Success) &&
 	    nitems == 1) {
 		if ((actual_type == XA_PIXMAP) && (format == 32) &&
@@ -162,14 +161,13 @@
 		for (i = 0; i < numChildren; i++) {
 			Atom actual_type;
 			int actual_format;
-			long nitems, bytesafter;
+			unsigned long nitems, bytesafter;
 			Window *newRoot = NULL;
 
 			if (XGetWindowProperty(disp, children[i], __SWM_VROOT,
 					0, 1, FALSE, XA_WINDOW, &actual_type,
 					&actual_format,
-					(unsigned long *) &nitems,
-					(unsigned long *) &bytesafter,
+					&nitems, &bytesafter,
 					(unsigned char **) &newRoot)
 					== Success && newRoot) {
 				root = *newRoot;