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.
This commit is contained in:
parent
c51453d997
commit
0a47eac473
3 changed files with 16 additions and 1 deletions
|
@ -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.
|
||||
|
|
|
@ -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__ */
|
||||
|
||||
|
|
|
@ -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_ */
|
||||
|
|
Loading…
Add table
Reference in a new issue