mkdtemp can now use the full <inttypes.h>.

diff --git a/ChangeLog b/ChangeLog
index 743938e5db27f94643129060f3df8f021ba7ea78..ee877afd1833b39f58295d55685f46b2d120e60f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-10  Bruno Haible  <bruno@clisp.org>
+
+       * modules/mkdtemp (Files): Remove m4/ulonglong.m4, m4/stdint_h.m4,
+       m4/inttypes_h.m4, m4/uintmax_t.m4.
+
 2006-09-09  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_emit_lib_Makefile_am): Eliminate lib_LDFLAGS

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7a7f842d049f85796c5179cfbf12a24d447c9601..8b6902bd308d68bab17757bc8b03bced47a0c732 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-10  Bruno Haible  <bruno@clisp.org>
+
+       * mkdtemp.c: Include <stdint.h> always. Don't include <inttypes.h>.
+
 2006-09-10  Sergey Poznyakoff  <gray@gnu.org.ua>
 
        * argp-parse.c (__argp_parse) [!_LIBC]: Make sure

diff --git a/lib/mkdtemp.c b/lib/mkdtemp.c
index 8bc04121ddf0f7a35f2416968056d114eafa31b3..3228f0557655a6dbec4924326391adf57dfb6e16 100644 (file)
--- a/lib/mkdtemp.c
+++ b/lib/mkdtemp.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -38,13 +39,6 @@
 # define TMP_MAX 238328
 #endif
 
-#if HAVE_STDINT_H || _LIBC
-# include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
 #include <unistd.h>
 
 #if HAVE_GETTIMEOFDAY || _LIBC

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 992b87b6c6740ad9a89009307c583616a34aeddc..61c4e6f923b9059ee0e8d32f4a42d2a969521b1d 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-10  Bruno Haible  <bruno@clisp.org>
+
+       * mkdtemp.m4 (gl_PREREQ_MKDTEMP): Don't require gl_AC_TYPE_UINTMAX_T.
+
 2006-09-08  Paul Eggert  <eggert@cs.ucla.edu>
 
        * mktime.m4 (AC_FUNC_MKTIME): Sync from Autoconf.

diff --git a/m4/mkdtemp.m4 b/m4/mkdtemp.m4
index e02c8256c91c1611c458ab665a4dc26607ac60a5..e39bcb938e5f3e0e60f3249257bca0c29412c28b 100644 (file)
--- a/m4/mkdtemp.m4
+++ b/m4/mkdtemp.m4
@@ -1,5 +1,5 @@
-# mkdtemp.m4 serial 3
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+# mkdtemp.m4 serial 4
+dnl Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,5 @@ AC_DEFUN([gl_PREREQ_MKDTEMP],
   AC_REQUIRE([AC_HEADER_STAT])
   AC_CHECK_HEADERS_ONCE(sys/time.h unistd.h)
   AC_CHECK_HEADERS(time.h)
-  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
   AC_CHECK_FUNCS(gettimeofday)
 ])

diff --git a/modules/mkdtemp b/modules/mkdtemp
index cbb64d9613e5178a36d91c5083727e5b26f89773..3188036eaa08b44eca423ed880e01c335dae4b8f 100644 (file)
--- a/modules/mkdtemp
+++ b/modules/mkdtemp
@@ -4,13 +4,10 @@ mkdtemp() function: create a private temporary directory.
 Files:
 lib/mkdtemp.h
 lib/mkdtemp.c
-m4/ulonglong.m4
-m4/stdint_h.m4
-m4/inttypes_h.m4
-m4/uintmax_t.m4
 m4/mkdtemp.m4
 
 Depends-on:
+stdint
 unistd
 
 configure.ac: