Merge from trunk.

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

diff --git a/nt/config.nt b/nt/config.nt
index 3436bc9..923143c 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -240,6 +240,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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
@@ -316,7 +317,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define PACKAGE "emacs"
 
 /* Version number of package */
-#define VERSION "24.0.50"
+#define VERSION "24.0.90"
 
 /* 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.  */
@@ -469,7 +470,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