[Emacs-diffs] /srv/bzr/emacs/trunk r104031: Support inttypes.h and strtoumax in non-MinGW builds on Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 104031
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2011-04-28 00:14:34 +0300
message:
  Support inttypes.h and strtoumax in non-MinGW builds on Windows.
  
   nt/inc/inttypes.h: New file.
   nt/config.nt (HAVE_DECL_STRTOULL, HAVE_DECL_STRTOUMAX)
   (HAVE_STRTOULL, HAVE_STRTOUMAX): New macros.
added:
  nt/inc/inttypes.h
modified:
  nt/ChangeLog
  nt/config.nt

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2011-04-27 19:51:19 +0000
+++ b/nt/ChangeLog      2011-04-27 21:14:34 +0000
@@ -1,3 +1,10 @@
+2011-04-27  Eli Zaretskii  <address@hidden>
+
+       * inc/inttypes.h: New file.
+
+       * config.nt (HAVE_DECL_STRTOULL, HAVE_DECL_STRTOUMAX)
+       (HAVE_STRTOULL, HAVE_STRTOUMAX): New macros.
+
 2011-04-27  Daniel Colascione  <address@hidden>
 
        * cmdproxy.c (try_dequote_cmdline): Notice variable substitutions

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2011-04-06 15:44:32 +0000
+++ b/nt/config.nt      2011-04-27 21:14:34 +0000
@@ -299,6 +299,20 @@
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
+/* Define to 1 if you have the declaration of `strtoull', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRTOULL 1
+
+/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRTOUMAX 1
+
+/* Define to 1 if you have the `strtoull' function. */
+#define HAVE_STRTOULL 1
+
+/* Define to 1 if you have the `strtoumax' function. */
+#define HAVE_STRTOUMAX 1
+
 /* Define if you have the 'wchar_t' type. */
 #define HAVE_WCHAR_T 1
 

=== added file 'nt/inc/inttypes.h'
--- a/nt/inc/inttypes.h 1970-01-01 00:00:00 +0000
+++ b/nt/inc/inttypes.h 2011-04-27 21:14:34 +0000
@@ -0,0 +1,30 @@
+/* Replacement inntypes.h file for building GNU Emacs on Windows with MSVC.
+
+Copyright (C) 2011  Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _REPL_INTTYPES_H
+#define _REPL_INTTYPES_H
+
+#ifdef __MINGW32__
+#include_next <inttypes.h>
+#else  /* !__MINGW32__ */
+#define uintmax_t unsigned __int64
+#define strtoumax _strtoui64
+#endif /* !__MINGW32__ */
+
+#endif