upstream i think

9 files changed, 76 insertions, 18 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 8de94033196..859123c1a86 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,23 @@
+2011-11-27  Fabrice Popineau  <fabrice.popineau@supelec.fr>  (tiny change)
+
+        * inc/stdint.h (uint32_t, uint64_t) [_WIN64]: New typedefs.
+        (UINT64_MAX) [_WIN64]: Fix definition.
+        (uintmax_t, intmax_t): Fix definitions.
+
+        * inc/inttypes.h (strtoumax, strtoimax) [!__MINGW32__]: Provide
+        correct definitions.
+
+        * config.nt (HAVE_DECL_STRTOLL): Define.
+        (va_copy) [_WIN64]: Provide a better definition.
+
+2011-11-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * configure.bat: Fix typos.
+
+2011-11-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * INSTALL: Elaborate on debugging fatal errors.
+
 2011-11-15  Eli Zaretskii  <eliz@gnu.org>
 
         * README.W32: Update the GTK Windows download URL for libpng.
@@ -1784,7 +1804,7 @@
 
 1998-12-08  Geoff Voelker  <voelker@cs.washington.edu>
 
-        * makefile.nt: Do string comparision of _NMAKE_VER.
+        * makefile.nt: Do string comparison of _NMAKE_VER.
 
 1998-12-02  Geoff Voelker  <voelker@cs.washington.edu>
 
diff --git a/nt/INSTALL b/nt/INSTALL
index bb621dceb6b..9947cd86a34 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -599,6 +599,30 @@
   the debugger, and you will be able to debug the cause of the fatal
   error.
 
+  The single most important thing to find out when Emacs aborts or
+  crashes is where did that happen in the Emacs code.  This is called
+  "backtrace".
+
+  Emacs on Windows uses more than one thread.  When Emacs aborts due
+  to a fatal error, the current thread may not be the application
+  thread running Emacs code.  Therefore, to produce a meaningful
+  backtrace from a debugger, you need to instruct it to show the
+  backtrace for every thread.  With GDB, you do it like this:
+
+   (gdb) thread apply all backtrace
+
+  To run Emacs under a debugger to begin with, simply start it from
+  the debugger.  With GDB, chdir to the `src' directory (if you have
+  the source tree) or to a directory with the `.gdbinit' file (if you
+  don't have the source tree), and type these commands:
+
+    C:\whatever\src> gdb x:\path\to\emacs.exe
+    (gdb) run <ARGUMENTS TO EMACS>
+
+  Thereafter, use Emacs as usual; you can minimize the debugger
+  window, if you like.  The debugger will take control if and when
+  Emacs crashes.
+
   Emacs functions implemented in C use a naming convention that reflects
   their names in lisp.  The names of the C routines are the lisp names
   prefixed with 'F', and with dashes converted to underscores.  For
diff --git a/nt/config.nt b/nt/config.nt
index 3a06a9f5b7a..c77faccb3b4 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -303,6 +303,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* 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
@@ -324,7 +328,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define PACKAGE "emacs"
 
 /* Version number of package */
-#define VERSION "24.0.91"
+#define VERSION "24.0.92"
 
 /* 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.  */
@@ -353,8 +357,8 @@ typedef unsigned short mode_t;
 /* 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))
diff --git a/nt/configure.bat b/nt/configure.bat
index 45d966fc34d..c503900274e 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -155,7 +155,7 @@ echo.   --without-jpeg          do not use JPEG library even if it is installed
 echo.   --without-gif           do not use GIF library even if it is installed

 echo.   --without-tiff          do not use TIFF library even if it is installed

 echo.   --without-xpm           do not use XPM library even if it is installed

-echo.   --without-gnutls        do not use GNUTLS library even if it is installed

+echo.   --without-gnutls        do not use GnuTLS library even if it is installed

 echo.   --with-svg              use the RSVG library (experimental)

 echo.   --distfiles             path to files for make dist, e.g. libXpm.dll

 if "%use_extensions%" == "0" goto end

@@ -563,7 +563,7 @@ set HAVE_GNUTLS=
 goto :tlsDone

 

 :haveTls

-echo ...GNUTLS header available, building with GNUTLS support.

+echo ...GnuTLS header available, building with GnuTLS support.

 set HAVE_GNUTLS=1

 

 :tlsDone

diff --git a/nt/emacs.rc b/nt/emacs.rc
index 9f7fc6f14aa..479a228bb69 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -7,8 +7,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,0,91,0
- PRODUCTVERSION 24,0,91,0
+ FILEVERSION 24,0,92,0
+ PRODUCTVERSION 24,0,92,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -25,12 +25,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Free Software Foundation\0"
             VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
-            VALUE "FileVersion", "24, 0, 91, 0\0"
+            VALUE "FileVersion", "24, 0, 92, 0\0"
             VALUE "InternalName", "Emacs\0"
             VALUE "LegalCopyright", "Copyright (C) 2001-2011\0"
             VALUE "OriginalFilename", "emacs.exe"
             VALUE "ProductName", "Emacs\0"
-            VALUE "ProductVersion", "24, 0, 91, 0\0"
+            VALUE "ProductVersion", "24, 0, 92, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index 6de1daeb959..b653e1fb952 100644
--- a/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@ -5,8 +5,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,0,91,0
- PRODUCTVERSION 24,0,91,0
+ FILEVERSION 24,0,92,0
+ PRODUCTVERSION 24,0,92,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Free Software Foundation\0"
             VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
-            VALUE "FileVersion", "24, 0, 91, 0\0"
+            VALUE "FileVersion", "24, 0, 92, 0\0"
             VALUE "InternalName", "EmacsClient\0"
             VALUE "LegalCopyright", "Copyright (C) 2001-2011\0"
             VALUE "OriginalFilename", "emacsclientw.exe"
             VALUE "ProductName", "EmacsClient\0"
-            VALUE "ProductVersion", "24, 0, 91, 0\0"
+            VALUE "ProductVersion", "24, 0, 92, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END
diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h
index 3e8b55ab98e..ba26cc1115d 100644
--- a/nt/inc/inttypes.h
+++ b/nt/inc/inttypes.h
@@ -24,7 +24,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include_next <inttypes.h>
 #else  /* !__MINGW32__ */
 #include "stdint.h"
+#ifdef _WIN64
 #define strtoumax _strtoui64
+#define strtoimax _strtoi64
+#else
+#define strtoumax strtoul
+#define strtoimax strtol
+#endif
 #endif  /* !__MINGW32__ */
 
 #endif
diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
index fa2e06f3da9..4eda1c5a688 100644
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -29,7 +29,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef _WIN64
 typedef __int64 intptr_t;
-#define UINT64_MAX 18446744073709551615
+typedef unsigned int uint32_t;
+typedef unsigned __int64 uint64_t;
+#define UINT64_MAX (18446744073709551615i64)
 #define UINT64_MIN 0
 /* "i64" is the non-standard suffix used by MSVC for 64-bit constants.  */
 #define INT64_MAX 9223372036854775807i64
@@ -39,6 +41,8 @@ typedef __int64 intptr_t;
 #define UINTMAX_MIN UINT64_MIN
 #define INTMAX_MAX INT64_MAX
 #define INTMAX_MIN INT64_MIN
+#define uintmax_t unsigned __int64
+#define intmax_t __int64
 #else
 typedef int intptr_t;
 typedef unsigned int uint32_t;
@@ -51,10 +55,10 @@ typedef unsigned int uint32_t;
 #define UINTMAX_MIN UINT32_MIN
 #define INTMAX_MAX INT32_MAX
 #define INTMAX_MIN INT32_MIN
+#define uintmax_t unsigned long
+#define intmax_t long
 #endif
 
-#define uintmax_t unsigned __int64
-#define intmax_t __int64
 #define PTRDIFF_MAX INTPTR_MAX
 
 #endif  /* !__GNUC__ */
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 194f0759bbf..a474e34eaa5 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -22,7 +22,7 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out

 #        (and remove or replace this comment).

 

-VERSION         = 24.0.91

+VERSION         = 24.0.92

 

 TMP_DIST_DIR    = emacs-$(VERSION)