X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconfig.h.in;h=0eec507fa0ea63e42622a8c7fb7e041d55b30321;hb=4aa6e8eb91e514ddfac11bc89a946b247cdf99d1;hp=cd8afbda18cf3597e09c8ce2fd5a375ba087160b;hpb=d8bd7eee3147c839d3c74d1823c139cd54867a75;p=chise%2Fxemacs-chise.git

diff --git a/src/config.h.in b/src/config.h.in
index cd8afbd..0eec507 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -34,12 +34,15 @@ Boston, MA 02111-1307, USA.  */
 #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 @@ char *alloca ();
 #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
@@ -204,6 +208,7 @@ char *alloca ();
    configure.in. */
 #undef HAVE_MCHECK_H
 #undef HAVE_A_OUT_H
+#undef HAVE_ELF_H
 #undef HAVE_CYGWIN_VERSION_H
 #undef HAVE_FCNTL_H
 #undef HAVE_INTTYPES_H
@@ -331,7 +336,7 @@ char *alloca ();
 
 /* 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 +346,8 @@ char *alloca ();
 #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
@@ -713,7 +718,7 @@ extern "C" {
 
    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