Replace string-to-int with string-to-number.

[bpt/emacs.git] / nt / config.nt

diff --git a/nt/config.nt b/nt/config.nt
index 32c56e4..a41d6ec 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 /* No code in Emacs #includes config.h twice, but some of the code
-   intended to work with other packages as well (like gmalloc.c) 
+   intended to work with other packages as well (like gmalloc.c)
    think they can include it as many times as they like.  */
 #ifndef EMACS_CONFIG_H
 #define EMACS_CONFIG_H
@@ -41,7 +41,14 @@ Boston, MA 02111-1307, USA.  */
 /* Define REL_ALLOC if you want to use the relocating allocator for
    buffer space. */
 #define REL_ALLOC
-  
+
+/* Enable conservative stack marking for GC.  */
+#define GC_MARK_STACK 1
+
+/* MSVC ignores the "register" keyword, so test fails even though
+   setjmp does work.  */
+#define GC_SETJMP_WORKS 1
+
 /* Define HAVE_X_WINDOWS if you want to use the X window system.  */
 #undef HAVE_X_WINDOWS
 
@@ -132,6 +139,7 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_TERMIOS_H
 #undef HAVE_LIMITS_H
 #undef HAVE_STRING_H
+#undef HAVE_PWD_H
 #undef STDC_HEADERS
 #undef TIME_WITH_SYS_TIME
 
@@ -232,6 +240,17 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_GETCWD
 #undef HAVE_SHUTDOWN
 #undef HAVE_STRFTIME
+/* Standard Windows strftime does not support POSIX.2 extensions.  */
+#define STRFTIME_NO_POSIX2 1
+
+#define HAVE_SENDTO 1
+#define HAVE_RECVFROM 1
+#define HAVE_GETSOCKOPT 1
+#define HAVE_SETSOCKOPT 1
+#define HAVE_GETSOCKNAME 1
+#define HAVE_GETPEERNAME 1
+/* Local (unix) sockets are not supported.  */
+#undef HAVE_SYS_UN_H
 
 #define LOCALTIME_CACHE
 #undef HAVE_INET_SOCKETS
@@ -270,7 +289,7 @@ Boston, MA 02111-1307, USA.  */
    configuration names to use for them.
 
    See s/template.h for documentation on writing s/SYSTEM.h files.  */
-#undef config_opsysfile 
+#undef config_opsysfile
 #include "s/ms-w32.h"
 
 /* The configuration script defines machfile to be the name of the
@@ -354,7 +373,7 @@ Boston, MA 02111-1307, USA.  */
 #ifdef emacs /* Don't do this for lib-src.  */
 /* Tell regex.c to use a type compatible with Emacs.  */
 #define RE_TRANSLATE_TYPE Lisp_Object
-#define RE_TRANSLATE(TBL, C) char_table_translate (TBL, C)
+#define RE_TRANSLATE(TBL, C) CHAR_TABLE_TRANSLATE (TBL, C)
 #define RE_TRANSLATE_P(TBL) (XFASTINT (TBL) != 0)
 #endif
 
@@ -363,6 +382,8 @@ Boston, MA 02111-1307, USA.  */
 #define mktime emacs_mktime
 #endif
 
+#define my_strftime nstrftime   /* for strftime.c */
+
 /* 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.  */
@@ -440,3 +461,14 @@ extern char *getenv ();
 #include "string.h"
 #endif
 #endif
+
+#ifndef NO_RETURN
+#if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR >= 5))
+#define NO_RETURN      __attribute__ ((__noreturn__))
+#else
+#define NO_RETURN      /* nothing */
+#endif
+#endif
+
+/* arch-tag: df720992-aa5a-499a-882d-958dc5eeb5e9
+   (do not change this comment) */