Merge from origin/emacs-25

[gnu-emacs] / nt / inc / inttypes.h

diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h
index 8f9c6ede76011b4abad599a4abae9b5e59297853..9abd55daeca87d9ca905968c64c9a77009499161 100644 (file)
--- a/nt/inc/inttypes.h
+++ b/nt/inc/inttypes.h
@@ -1,6 +1,6 @@
-/* Replacement inntypes.h file for building GNU Emacs on Windows with MSVC.
+/* Replacement inttypes.h file for building GNU Emacs on Windows with MSVC.
 
-Copyright (C) 2011  Free Software Foundation, Inc.
+Copyright (C) 2011-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -23,8 +23,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef __MINGW32__
 #include_next <inttypes.h>
 #else  /* !__MINGW32__ */
-#define uintmax_t unsigned __int64
+#include "stdint.h"
+#ifdef _WIN64
 #define strtoumax _strtoui64
+#define strtoimax _strtoi64
+#else
+#define strtoumax strtoul
+#define strtoimax strtol
+#endif
 #endif /* !__MINGW32__ */
 
 #endif