X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/044c22e545acef592ed95e4e3bb9f8aeff67291a..003fdae20108225e6993e987a46b095765c151f0:/nt/config.nt
diff --git a/nt/config.nt b/nt/config.nt
index 3436bc989e..0ae14c93d9 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,6 +1,6 @@
/* GNU Emacs site configuration template file. -*- C -*-
-Copyright (C) 1988, 1993-1994, 2001-2011 Free Software Foundation, Inc.
+Copyright (C) 1988, 1993-1994, 2001-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -138,7 +138,6 @@ along with GNU Emacs. If not, see . */
#undef HAVE_LIBPTHREADS
#undef HAVE_LIBRESOLV
#undef HAVE_LIBXMU
-#undef HAVE_LIBNCURSES
#undef HAVE_LIBINTL
/* movemail Kerberos support */
@@ -187,7 +186,14 @@ along with GNU Emacs. If not, see . */
#undef TM_IN_SYS_TIME
#undef HAVE_TM_ZONE
-#undef HAVE_TZNAME
+
+/* Define to 1 if you don't have `tm_zone' but do have the external array
+ `tzname'. */
+#define HAVE_TZNAME 1
+
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+ */
+#define HAVE_DECL_TZNAME 1
#undef const
@@ -215,7 +221,6 @@ along with GNU Emacs. If not, see . */
#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
@@ -228,6 +233,9 @@ along with GNU Emacs. If not, see . */
#undef HAVE_UTIMES
#undef HAVE_SETRLIMIT
#undef HAVE_SETPGID
+/* If you think about defining HAVE_GETCWD, don't: the alternative
+ getwd is redefined on w32.c, and does not really return the current
+ directory, to get the desired results elsewhere in Emacs */
#undef HAVE_GETCWD
#undef HAVE_SHUTDOWN
#undef HAVE_STRFTIME
@@ -240,6 +248,7 @@ along with GNU Emacs. If not, see . */
#define HAVE_SETSOCKOPT 1
#define HAVE_GETSOCKNAME 1
#define HAVE_GETPEERNAME 1
+#define HAVE_SNPRINTF 1
#define HAVE_LANGINFO_CODESET 1
/* Local (unix) sockets are not supported. */
#undef HAVE_SYS_UN_H
@@ -295,6 +304,10 @@ along with GNU Emacs. If not, see . */
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
+/* Define to 1 if you have the declaration of `strtoll', and to 0 if you
+ don't. */
+#define HAVE_DECL_STRTOLL 1
+
/* Define to 1 if you have the declaration of `strtoull', and to 0 if you
don't. */
#define HAVE_DECL_STRTOULL 1
@@ -316,13 +329,17 @@ along with GNU Emacs. If not, see . */
#define PACKAGE "emacs"
/* Version number of package */
-#define VERSION "24.0.50"
+#define VERSION "24.1.50"
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
+#ifdef __GNUC__
#ifndef __cplusplus
#undef inline
#endif
+#else /* MSVC */
+#define inline __inline
+#endif
/* Define to the equivalent of the C99 'restrict' keyword, or to
nothing if this is not supported. Do not define if restrict is
@@ -333,11 +350,16 @@ along with GNU Emacs. If not, see . */
# define restrict
#endif
+/* `mode_t' is not defined for MSVC. Define. */
+#ifdef _MSC_VER
+typedef unsigned short mode_t;
+#endif
+
/* A va_copy replacement for MSVC. */
#ifdef _MSC_VER
# ifdef _WIN64
-# ifndef va_copy
-# error "va_copy is needed, but not defined!"
+# ifndef va_copy /* Need to be checked (?) */
+# define va_copy(d,s) ((d) = (s))
# endif
# else /* not _WIN64 */
# define va_copy(d,s) ((d) = (s))
@@ -469,7 +491,7 @@ extern char *getenv ();
#define BITS_PER_LONG 32
#endif
-#if defined(__MINGW32__) || _MSC_VER >= 1400
+#if defined (__MINGW32__) || _MSC_VER >= 1400
/* Define to 1 if the system has the type `long long int'. */
# define HAVE_LONG_LONG_INT 1