Merge from emacs-24; up to 2012-12-25T15:07:59Z!dmantipov@yandex.ru

[bpt/emacs.git] / msdos / inttypes.h

diff --git a/msdos/inttypes.h b/msdos/inttypes.h
index 650fea1..2f45b56 100644 (file)
--- a/msdos/inttypes.h
+++ b/msdos/inttypes.h
@@ -1,6 +1,6 @@
 /* Replacement inntypes.h file for building GNU Emacs on MS-DOS with DJGPP.
 
-Copyright (C) 2011  Free Software Foundation, Inc.
+Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -20,12 +20,18 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef _REPL_INTTYPES_H
 #define _REPL_INTTYPES_H
 
+/* As of May 2011, DJGPP v2.04 does not include stdint.h in its
+   inttypes.h, although it should.  Therefore, include stdint.h
+   unconditionally.  */
+#include <stdint.h>
+
 #if __DJGPP__ > 2 || __DJGPP_MINOR__ >= 4
 #include_next <inttypes.h>
 #else  /* __DJGPP__ < 2.04 */
 #include <stdlib.h>
-#define uintmax_t unsigned long long
 #define strtoumax strtoull
+#define strtoimax strtoll
+#define PRIuMAX   "llu"
 #endif /* __DJGPP__ < 2.04 */
 
 #endif