Update file comments.

Update undefs added/removed in src/config.in.

1 files changed, 54 insertions, 23 deletions

diff --git a/nt/config.nt b/nt/config.nt
index 6a59cdc1ba6..aaf8ab4235a 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -14,8 +14,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
@@ -33,9 +33,12 @@ Boston, MA 02111-1307, USA.  */
    numbers. */
 #undef LISP_FLOAT_TYPE
 
-/* Define GNU_MALLOC if you want to use the *new* GNU memory allocator. */
+/* Define GNU_MALLOC if you want to use the GNU memory allocator. */
 #undef GNU_MALLOC
 
+/* Define if you are using the GNU C Library. */
+#undef DOUG_LEA_MALLOC
+
 /* Define REL_ALLOC if you want to use the relocating allocator for
    buffer space. */
 #undef REL_ALLOC
@@ -53,20 +56,23 @@ Boston, MA 02111-1307, USA.  */
 /* Define this if you're using XFree386.  */
 #undef HAVE_XFREE386
 
-/* Define HAVE_X_MENU if you want to use the X window menu system.
-   This appears to work on some machines that support X
-   and not on others.  */
-#undef HAVE_X_MENU
+/* Define HAVE_MENUS if you have mouse menus.
+   (This is automatic if you use X, but the option to specify it remains.)
+   It is also defined with other window systems that support xmenu.c.  */
+#undef HAVE_MENUS
 
 /* Define if we have the X11R6 or newer version of Xt.  */
 #undef HAVE_X11XTR6
 
+/* Define if we have the X11R6 or newer version of Xlib.  */
+#undef HAVE_X11R6
+
+/* Define if we have the X11R5 or newer version of Xlib.  */
+#undef HAVE_X11R5
+
 /* Define if netdb.h declares h_errno.  */
 #undef HAVE_H_ERRNO
 
-/* Nowadays we have frame objects even if we support only ASCII terminals.  */
-#define MULTI_FRAME
-
 /* If we're using any sort of window system, define some consequences.  */
 #ifdef HAVE_X_WINDOWS
 #define HAVE_WINDOW_SYSTEM
@@ -115,18 +121,37 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_SYS_TIME_H
 #undef HAVE_UNISTD_H
 #undef HAVE_UTIME_H
+#undef HAVE_LINUX_VERSION_H
+#undef HAVE_SYS_SYSTEMINFO_H
+#undef HAVE_TERMIOS_H
+#undef HAVE_LIMITS_H
 #undef STDC_HEADERS
 #undef TIME_WITH_SYS_TIME
 
 #undef HAVE_LIBDNET
 #undef HAVE_LIBPTHREADS
 #undef HAVE_LIBRESOLV
+#undef HAVE_LIBXMU
+#undef HAVE_LIBNCURSES
+#undef HAVE_LIBKRB
+#undef HAVE_LIBDES
+
+/* Mail-file locking */
+#undef HAVE_LIBMAIL
+#undef HAVE_MAILLOCK_H
+#undef HAVE_TOUCHLOCK
 
 #undef HAVE_ALLOCA_H
 
 #undef HAVE_GETTIMEOFDAY
+/* If we don't have gettimeofday,
+   the test for GETTIMEOFDAY_ONE_ARGUMENT may succeed,
+   but we should ignore it.  */
+#ifdef HAVE_GETTIMEOFDAY
 #undef GETTIMEOFDAY_ONE_ARGUMENT
+#endif
 #undef HAVE_GETHOSTNAME
+#undef HAVE_GETDOMAINNAME
 #undef HAVE_DUP2
 #undef HAVE_RENAME
 #undef HAVE_CLOSEDIR
@@ -151,6 +176,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef HAVE_MKDIR
 #undef HAVE_RMDIR
+#undef HAVE_SYSINFO
 #undef HAVE_RANDOM
 #undef HAVE_LRAND48
 #undef HAVE_BCOPY
@@ -158,14 +184,25 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_LOGB
 #undef HAVE_FREXP
 #undef HAVE_FMOD
+#undef HAVE_RINT
+#undef HAVE_CBRT
 #undef HAVE_FTIME
 #undef HAVE_RES_INIT /* For -lresolv on Suns.  */
 #undef HAVE_SETSID
 #undef HAVE_FPATHCONF
 #undef HAVE_SELECT
 #undef HAVE_MKTIME
-#undef HAVE_EACCESS
+#undef HAVE_EUIDACCESS
 #undef HAVE_GETPAGESIZE
+#undef HAVE_TZSET
+#undef HAVE_SETLOCALE
+#undef HAVE_UTIMES
+#undef HAVE_SETRLIMIT
+#undef HAVE_SETPGID
+#undef HAVE_GETCWD
+#undef HAVE_SHUTDOWN
+
+#undef LOCALTIME_CACHE
 #undef HAVE_INET_SOCKETS
 
 #undef HAVE_AIX_SMT_EXP
@@ -174,8 +211,6 @@ Boston, MA 02111-1307, USA.  */
    Otherwise you must have the variable `char *sys_errlist[]'.  */
 #undef HAVE_STRERROR
 
-#undef HAVE_UTIMES
-
 /* Define if `sys_siglist' is declared by <signal.h>.  */
 #undef SYS_SIGLIST_DECLARED
 
@@ -218,15 +253,6 @@ Boston, MA 02111-1307, USA.  */
 #undef config_machfile
 #include "m/intel386.h"
 
-/* These typedefs shouldn't appear when alloca.s or Makefile.in
-   includes config.h.  */
-#ifndef NOT_C_CODE
-#ifndef SPECIAL_EMACS_INT
-typedef long EMACS_INT;
-typedef unsigned long EMACS_UINT;
-#endif
-#endif
-
 /* Load in the conversion definitions if this system
    needs them and the source file being compiled has not
    said to inhibit this.  There should be no need for you
@@ -299,6 +325,11 @@ typedef unsigned long EMACS_UINT;
 #define RE_TRANSLATE_TYPE Lisp_Object *
 #endif
 
+/* Avoid link-time collision with system mktime if we will use our own.  */
+#if ! HAVE_MKTIME || BROKEN_MKTIME
+#define mktime emacs_mktime
+#endif
+
 /* The rest of the code currently tests the CPP symbol BSTRING.
    Override any claims made by the system-description files.
    Note that on some SCO version it is possible to have bcopy and not bcmp.  */
@@ -327,7 +358,7 @@ extern char *getenv ();
 #endif /* EMACS_CONFIG_H */
 
 /* These default definitions are good for almost all machines.
-   The exceptions override them in m/*.h.  */
+   The exceptions override them in m/MACHINE.h.  */
 
 #ifndef BITS_PER_CHAR
 #define BITS_PER_CHAR 8