Assume correct S_ISDIR macro.

8 files changed, 20 insertions, 16 deletions

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index edcb44b..cc1f22a 100644
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,5 +1,11 @@
 2006-06-27  Bruno Haible  <bruno@clisp.org>
 
+	Assume correct S_ISDIR macro.
+	* mkdtemp.c: Remove test of STAT_MACROS_BROKEN.
+	* tmpdir.c: Remove test of STAT_MACROS_BROKEN.
+
+2006-06-27  Bruno Haible  <bruno@clisp.org>
+
 	Assume ANSI C header files and <ctype.h> functions.
 	* fnmatch.c (ISASCII): Remove macro.
 	(isblank): Renamed from ISBLANK.
diff --git a/gettext-tools/lib/mkdtemp.c b/gettext-tools/lib/mkdtemp.c
index 084ba2e..020b8f9 100644
--- a/gettext-tools/lib/mkdtemp.c
+++ b/gettext-tools/lib/mkdtemp.c
@@ -59,9 +59,6 @@
 #endif
 
 #include <sys/stat.h>
-#if STAT_MACROS_BROKEN
-# undef S_ISDIR
-#endif
 #if !defined S_ISDIR && defined S_IFDIR
 # define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 #endif
diff --git a/gettext-tools/lib/tmpdir.c b/gettext-tools/lib/tmpdir.c
index 588ec83..a007900 100644
--- a/gettext-tools/lib/tmpdir.c
+++ b/gettext-tools/lib/tmpdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001-2002, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -40,9 +40,6 @@
 #endif
 
 #include <sys/stat.h>
-#if STAT_MACROS_BROKEN
-# undef S_ISDIR
-#endif
 #if !defined S_ISDIR && defined S_IFDIR
 # define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 #endif
diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 4f69af5..1855424 100644
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-27  Bruno Haible  <bruno@clisp.org>
 
+	Assume correct S_ISDIR macro.
+	* tmpdir.m4 (gt_TMPDIR): Remove AC_STAT_MACROS_BROKEN invocation.
+
+2006-06-27  Bruno Haible  <bruno@clisp.org>
+
 	Assume working 'const'.
 	* fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Remove AC_C_CONST invocation.
 
diff --git a/gettext-tools/m4/tmpdir.m4 b/gettext-tools/m4/tmpdir.m4
index 0eec735..b06402e 100644
--- a/gettext-tools/m4/tmpdir.m4
+++ b/gettext-tools/m4/tmpdir.m4
@@ -1,5 +1,5 @@
-# tmpdir.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# tmpdir.m4 serial 2 (gettext-0.15)
+dnl Copyright (C) 2001-2002, 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.
@@ -8,6 +8,5 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gt_TMPDIR],
 [
-  AC_STAT_MACROS_BROKEN
   AC_CHECK_FUNCS(__secure_getenv)
 ])
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index c9dc903..50c19b9 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-27  Bruno Haible  <bruno@clisp.org>
+
+	Assume correct S_ISDIR macro.
+	* write-csharp.c: Remove test of STAT_MACROS_BROKEN.
+	* write-java.c: Likewise.
+
 2006-04-14  Bruno Haible  <bruno@clisp.org>
 
 	Assume autoconf >= 2.60.
diff --git a/gettext-tools/src/write-csharp.c b/gettext-tools/src/write-csharp.c
index 4034221..0511b18 100644
--- a/gettext-tools/src/write-csharp.c
+++ b/gettext-tools/src/write-csharp.c
@@ -31,9 +31,6 @@
 #include <string.h>
 
 #include <sys/stat.h>
-#if STAT_MACROS_BROKEN
-# undef S_ISDIR
-#endif
 #if !defined S_ISDIR && defined S_IFDIR
 # define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 #endif
diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c
index 041450a..43989cd 100644
--- a/gettext-tools/src/write-java.c
+++ b/gettext-tools/src/write-java.c
@@ -32,9 +32,6 @@
 #include <string.h>
 
 #include <sys/stat.h>
-#if STAT_MACROS_BROKEN
-# undef S_ISDIR
-#endif
 #if !defined S_ISDIR && defined S_IFDIR
 # define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 #endif