Use Gnulib inttypes module

Needed for platforms like MinGW that don’t support C99 PRIdPTR.
* admin/merge-gnulib (GNULIB_MODULES): Add inttypes.
* m4/gnulib-comp.m4: Regenerate.

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 3f32536a629134bd2f8994f8e3ceaab8d9ad2737..98f7941bd80222b770f74d550a40cf11c70412d2 100755 (executable)
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -36,7 +36,7 @@ GNULIB_MODULES='
   fchmodat fcntl fcntl-h fdopendir
   filemode filename filevercmp flexmember fpieee fstatat fsusage fsync futimens
   getloadavg getopt-gnu getrandom gettime gettimeofday gitlog-to-changelog
-  ieee754-h ignore-value intprops largefile libgmp lstat
+  ieee754-h ignore-value intprops inttypes largefile libgmp lstat
   manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime nstrftime
   pathmax pipe2 pselect pthread_sigmask
   qcopy-acl readlink readlinkat regex

diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 92d0621c61a604cb5ea649fcb377d241e2ff6635..e7e9fbdc3120f9f067c2963e65829416ea816478 100644 (file)
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -116,6 +116,7 @@
 #  ieee754-h \
 #  ignore-value \
 #  intprops \
+#  inttypes \
 #  largefile \
 #  libgmp \
 #  lstat \

diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 5bfa1473eddc8defb393e54beabb3ac667a2d6a6..1f8a87218ecd2ce1626c4e64badca1b19d113246 100644 (file)
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -113,6 +113,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module ignore-value:
   # Code from module include_next:
   # Code from module intprops:
+  # Code from module inttypes:
   # Code from module inttypes-incomplete:
   # Code from module largefile:
   AC_REQUIRE([AC_SYS_LARGEFILE])
@@ -342,6 +343,7 @@ AC_DEFUN([gl_INIT],
   fi
   gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
   gl_IEEE754_H
+  gl_INTTYPES_H
   gl_INTTYPES_INCOMPLETE
   AC_REQUIRE([gl_LARGEFILE])
   gl___INLINE