Adapt Windows include files to latest changes.

 nt/inc/inttypes.h [!__MINGW32__]: Include stdint.h.  Move the
 definition of uintmax_t from here...
 nt/inc/stdint.h (uintmax_t): ...to here.
 (intptr_t) [!__GNUC__]: New typedef.

3 files changed, 16 insertions, 1 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 83d13ce77c6..6ad8063bb0f 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/inttypes.h [!__MINGW32__]: Include stdint.h.  Move the
+        definition of uintmax_t from here...
+        * inc/stdint.h (uintmax_t): ...to here.
+        (intptr_t) [!__GNUC__]: New typedef.
+
 2011-05-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * config.nt: Prepare to configure 64-bit integers for older compilers.
diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h
index 8f9c6ede760..3e8b55ab98e 100644
--- a/nt/inc/inttypes.h
+++ b/nt/inc/inttypes.h
@@ -23,7 +23,7 @@ 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"
 #define strtoumax _strtoui64
 #endif  /* !__MINGW32__ */
 
diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
index ed4e26a6867..555ca9182ff 100644
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -29,6 +29,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 typedef unsigned int uint32_t;
 
+#ifdef _WIN64
+  typedef __int64 intptr_t;
+#else
+  typedef int intptr_t;
+#endif
+
+#define uintmax_t unsigned __int64
+
 #endif  /* !__GNUC__ */
 
 #endif /* _NT_STDINT_H_ */