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.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 83d13ce77c62452c10205a632cfb21aa4348b634..6ad8063bb0fa0e17fae6a4ab04441da2969f33d6 100644 (file)
--- 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 8f9c6ede76011b4abad599a4abae9b5e59297853..3e8b55ab98e4e67af77a79e9b4d9c29f10c9c553 100644 (file)
--- 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 ed4e26a68678339a90e30fa9629d3cd84e20d288..555ca9182ff0554ba42bd135f0365a88bde1cb46 100644 (file)
--- 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_ */