[Emacs-diffs] /srv/bzr/emacs/trunk r104140: Adapt Windows include files to latest changes.

[Eli Zaretskii]

------------------------------------------------------------
revno: 104140
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2011-05-06 15:09:08 +0300
message:
  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.
modified:
  nt/ChangeLog
  nt/inc/inttypes.h
  nt/inc/stdint.h

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2011-05-06 05:55:01 +0000
+++ b/nt/ChangeLog      2011-05-06 12:09:08 +0000
@@ -1,3 +1,10 @@
+2011-05-06  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * config.nt: Prepare to configure 64-bit integers for older compilers.

=== modified file 'nt/inc/inttypes.h'
--- a/nt/inc/inttypes.h 2011-04-27 21:14:34 +0000
+++ b/nt/inc/inttypes.h 2011-05-06 12:09:08 +0000
@@ -23,7 +23,7 @@
 #ifdef __MINGW32__
 #include_next <inttypes.h>
 #else  /* !__MINGW32__ */
-#define uintmax_t unsigned __int64
+#include "stdint.h"
 #define strtoumax _strtoui64
 #endif /* !__MINGW32__ */
 

=== modified file 'nt/inc/stdint.h'
--- a/nt/inc/stdint.h   2011-02-21 20:16:43 +0000
+++ b/nt/inc/stdint.h   2011-05-06 12:09:08 +0000
@@ -29,6 +29,14 @@
 
 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_ */