--- a/src/config.h.in	Mon Aug 13 11:35:05 2007 +0200
+++ b/src/config.h.in	Mon Aug 13 11:36:19 2007 +0200
@@ -34,12 +34,15 @@
 #ifndef NOT_C_CODE
 #ifdef __GNUC__
 #define alloca __builtin_alloca
-#elif HAVE_ALLOCA_H
+#elif defined __DECC
+#include <alloca.h>
+#pragma intrinsic(alloca)
+#elif defined HAVE_ALLOCA_H
 #include <alloca.h>
 #elif defined(_AIX)
 #pragma alloca
 #elif ! defined (alloca)
-char *alloca ();
+void *alloca ();
 #endif
 #endif /* C code */
 
@@ -172,8 +175,9 @@
 #define HAVE_UNIXOID_EVENT_LOOP
 #endif
 
-/* Are we using XFree386? */
-#undef HAVE_XFREE386
+/* XFree86 has a different prototype for this function */
+#undef HAVE_XREGISTERIMINSTANTIATECALLBACK
+#undef XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE
 
 #undef THIS_IS_X11R4
 #undef THIS_IS_X11R5
@@ -331,7 +335,7 @@
 
 /* PTY support functions */
 #undef HAVE_GETPT	/* glibc's easy pty allocation function */
-#undef HAVE__GETPT	/*   SGI's easy pty allocation function */
+#undef HAVE__GETPTY	/*   SGI's easy pty allocation function */
 #undef HAVE_OPENPTY	/*   BSD's easy pty allocation function */
 #undef HAVE_GRANTPT	/* Unix98 */
 #undef HAVE_UNLOCKPT	/* Unix98 */
@@ -341,8 +345,8 @@
 #undef HAVE_ISASTREAM	/* SysV streams */
 #undef HAVE_PTY_H	/* Linux, Tru64 openpty */
 #undef HAVE_LIBUTIL_H	/* BSD openpty */
-#undef HAVE_SYS_STROPTS_H /* SysV streams */
-#undef HAVE_SYS_STRTIO_H  /* SysV streams TIOCSIGNAL */
+#undef HAVE_STROPTS_H	/* SysV streams */
+#undef HAVE_STRTIO_H	/* SysV streams TIOCSIGNAL */
 
 #undef HAVE_SOCKETS
 #undef HAVE_SOCKADDR_SUN_LEN
@@ -707,7 +711,7 @@
 
    Also, SunOS 4.1.1 contains buggy versions of strcmp and strcpy that
    sometimes reference memory past the end of the string, which can segv.
-   I don't know whether this is has been fixed as of 4.1.2 or 4.1.3. */
+   I don't know whether this has been fixed as of 4.1.2 or 4.1.3. */
 #if defined (sparc) && !defined (USG)
 #define OBJECTS_SYSTEM sunOS-fix.o strcmp.o strcpy.o
 #endif