From 116f7b5477be5c02eb87c6288c44ed56326a4b31 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 11 Jul 2012 13:44:31 +0200 Subject: [PATCH] nt/config.nt: Sync with autogen/config.in. (CLASH_DETECTION, DEFAULT_SOUND_DEVICE, DONT_REOPEN_PTY) (GNU_LIBRARY_PENDING_OUTPUT_COUNT, SIGNALS_VIA_CHARACTERS): New macros. (HAVE_MKDIR, HAVE_RENAME, HAVE_RMDIR, HAVE_STRERROR): Remove. --- nt/ChangeLog | 7 +++++++ nt/config.nt | 40 ++++++++++++++++++++++++++++------------ 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 07ce4d434ed..8edfc645404 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,10 @@ +2012-07-11 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + (CLASH_DETECTION, DEFAULT_SOUND_DEVICE, DONT_REOPEN_PTY) + (GNU_LIBRARY_PENDING_OUTPUT_COUNT, SIGNALS_VIA_CHARACTERS): New macros. + (HAVE_MKDIR, HAVE_RENAME, HAVE_RMDIR, HAVE_STRERROR): Remove. + 2012-07-10 Juanma Barranquero * config.nt: Sync with autogen/config.in. diff --git a/nt/config.nt b/nt/config.nt index c43feeabd38..c954f54468f 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -63,6 +63,11 @@ along with GNU Emacs. If not, see . */ /* Define this to enable compile time checks for the Lisp_Object data type. */ #undef CHECK_LISP_OBJECT_TYPE +/* Define if you want lock files to be written, so that Emacs can tell + instantly when you try to modify a file that someone else has modified in + his/her Emacs. */ +#undef CLASH_DETECTION + /* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP systems. This function is required for 'alloca.c' support on those systems. */ @@ -77,9 +82,17 @@ along with GNU Emacs. If not, see . */ /* Address of the start of the data segment. */ #undef DATA_START +/* Name of the default sound device. */ +#undef DEFAULT_SOUND_DEVICE + /* Define to 1 for DGUX with . */ #undef DGUX +/* Define if process.c does not need to close a pty to make it a controlling + terminal (it is already a controlling terminal of the subprocess, because + we did ioctl TIOCSCTTY). */ +#undef DONT_REOPEN_PTY + /* Define to 1 if you are using the GNU C Library. */ #undef DOUG_LEA_MALLOC @@ -134,6 +147,9 @@ along with GNU Emacs. If not, see . */ whether the gnulib module scanf shall be considered present. */ #undef GNULIB_SCANF +/* Value of PENDING_OUTPUT_COUNT if using the GNU C library. */ +#undef GNU_LIBRARY_PENDING_OUTPUT_COUNT + /* Define to 1 if you want to use the GNU memory allocator. */ #define GNU_MALLOC 1 @@ -605,9 +621,6 @@ along with GNU Emacs. If not, see . */ systems that support xmenu.c. */ #undef HAVE_MENUS -/* Define to 1 if you have the `mkdir' function. */ -#define HAVE_MKDIR 1 - /* Define to 1 if you have the `mkstemp' function. */ #undef HAVE_MKSTEMP @@ -684,18 +697,12 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `recvfrom' function. */ #define HAVE_RECVFROM 1 -/* Define to 1 if you have the `rename' function. */ -#define HAVE_RENAME 1 - /* Define to 1 if res_init is available. */ #undef HAVE_RES_INIT /* Define to 1 if you have the `rint' function. */ #undef HAVE_RINT -/* Define to 1 if you have the `rmdir' function. */ -#define HAVE_RMDIR 1 - /* Define to 1 if using librsvg. */ #undef HAVE_RSVG @@ -756,9 +763,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H @@ -1140,6 +1144,9 @@ along with GNU Emacs. If not, see . */ slash */ #undef REPLACE_FUNC_STAT_FILE +/* Make process_send_signal work by "typing" a signal character on the pty. */ +#undef SIGNALS_VIA_CHARACTERS + /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'sig_atomic_t'. */ #undef SIG_ATOMIC_T_SUFFIX @@ -1442,6 +1449,15 @@ along with GNU Emacs. If not, see . */ #undef vfork +/* Not valid on Windows. */ +#if 0 +/* On AIX 3 this must be included before any other include file. */ +#include +#if ! HAVE_ALLOCA +# error "alloca not available on this machine" +#endif +#endif + /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ #undef AMPERSAND_FULL_NAME -- 2.39.2