X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=nt%2Fconfig.h;h=78f8e6c876fd9a7369fd5560fbb3150ad8acb991;hb=1532bc4f9d544bee853b875b78703699bee95fdc;hp=48528efabc8344b361c798c40ac00bd34ddb6789;hpb=a1655b870904de973c366d85ebdc8adde4ef5e1e;p=chise%2Fxemacs-chise.git.1

diff --git a/nt/config.h b/nt/config.h
index 48528ef..78f8e6c 100644
--- a/nt/config.h
+++ b/nt/config.h
@@ -92,8 +92,8 @@ Boston, MA 02111-1307, USA.  */
 #define FUNCPROTO 15
 #endif
 
-/* Define this if you're using XFree386.  */
-#undef HAVE_XFREE386
+#define HAVE_XREGISTERIMINSTANTIATECALLBACK
+#undef XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE
 
 #undef THIS_IS_X11R4
 #undef THIS_IS_X11R5
@@ -148,16 +148,14 @@ Boston, MA 02111-1307, USA.  */
 /* Some things figured out by the configure script, grouped as they are in
    configure.in.  */
 #undef HAVE_MACH_MACH_H
-#undef HAVE_SYS_STROPTS_H
 #undef HAVE_SYS_TIMEB_H
 #undef HAVE_UNISTD_H
-#undef HAVE_UTIME_H
 #undef HAVE_SYS_WAIT_H
 #undef HAVE_LIBGEN_H
 #undef WORDS_BIGENDIAN
 #undef TIME_WITH_SYS_TIME
 
-#define HAVE_SYS_TIME_H
+#undef HAVE_SYS_TIME_H
 #define HAVE_LOCALE_H
 #ifdef HAVE_X_WINDOWS
 #define HAVE_X11_LOCALE_H
@@ -176,9 +174,6 @@ Boston, MA 02111-1307, USA.  */
 /* Define if `sys_siglist' is declared by <signal.h>. */
 #undef SYS_SIGLIST_DECLARED
 
-/* Define if `struct utimbuf' is declared by <utime.h>.  */
-#undef HAVE_STRUCT_UTIMBUF
-
 /* Define if `struct timeval' is declared by <sys/time.h>.  */
 #define HAVE_TIMEVAL
 
@@ -230,7 +225,10 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_FREXP
 #undef HAVE_FTIME
 #undef HAVE_GETHOSTNAME
-#undef HAVE_GETPAGESIZE
+
+#define HAVE_GETPAGESIZE
+#define getpagesize() 4096
+
 #define HAVE_GETTIMEOFDAY
 #define HAVE_GETWD
 #undef HAVE_LOGB
@@ -254,11 +252,27 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_SIGHOLD
 #undef HAVE_SIGPROCMASK
 #undef HAVE_SIGSETJMP
-#undef HAVE_STRCASECMP
 #define HAVE_STRERROR
 #undef HAVE_TZSET
+#undef HAVE_UTIME
 #undef HAVE_UTIMES
 #undef HAVE_WAITPID
+#undef HAVE_VSNPRINTF
+
+/* PTY support functions */
+#undef HAVE_GETPT	/* glibc'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 */
+#undef HAVE_PTSNAME	/* Unix98 */
+#undef HAVE_KILLPG	/* BSD */
+#undef HAVE_TCGETPGRP	/* Posix 1 */
+#undef HAVE_ISASTREAM	/* SysV streams */
+#undef HAVE_PTY_H	/* Linux, Tru64 openpty */
+#undef HAVE_LIBUTIL_H	/* BSD openpty */
+#undef HAVE_STROPTS_H	/* SysV streams */
+#undef HAVE_STRTIO_H	/* SysV streams TIOCSIGNAL */
 
 #define HAVE_SOCKETS
 #undef HAVE_SOCKADDR_SUN_LEN
@@ -496,7 +510,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* If you wish to compile with support for the Network Audio System
    system define HAVE_NAS_SOUND.
-   NAS_NO_ERROR_JUMP means that the NAS libraries don't inlcude some
+   NAS_NO_ERROR_JUMP means that the NAS libraries don't include some
    error handling changes.
  */
 #undef HAVE_NAS_SOUND
@@ -559,10 +573,8 @@ on various systems. */
 #define ENCAPSULATE_OPEN
 #define ENCAPSULATE_FOPEN
 #define ENCAPSULATE_MKDIR
-
-#if defined (WIN32) && defined (USE_IME)
-#define HAVE_FEP
-#endif
+#define ENCAPSULATE_STAT
+#define ENCAPSULATE_FSTAT
 
 #if defined (HAVE_SOCKS) && !defined (DO_NOT_SOCKSIFY)
 #define accept Raccept
@@ -598,9 +610,28 @@ on various systems. */
 
 /* 'expression' : signed/unsigned mismatch */
 #pragma warning ( disable : 4018 )
+/* unnamed type definition in parentheses
+  (Martin added a pedantically correct definition of ALIGNOF, which
+  generates temporary anonymous structures, and MSVC complains) */
+#pragma warning ( disable : 4116 )
 
 #endif /* compiler understands #pragma warning*/
 
+#ifndef NOT_C_CODE /* Actually means C or C++ */
+# if defined (__cplusplus)
+/* Avoid C++ keywords used as ordinary C identifiers */
+#  define class c_class
+#  define new   c_new
+#  define this  c_this
+#  define catch c_catch
+#  define not   c_not
+
+#  define EXTERN_C extern "C"
+# else /* C code */
+#  define EXTERN_C extern
+# endif
+#endif /* C or C++ */
+
 #define enum_field(enumeration_type) unsigned int
 
 /* We want to avoid saving the signal mask if possible, because