Assume correct S_ISDIR macro.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index edcb44bf790cfd53ce0b0e565889ddcfa1f1b616..cc1f22a5c87e06fd71046de41ffebab5c55d71c6 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gettext-tools/lib/mkdtemp.c b/gettext-tools/lib/mkdtemp.c
index 084ba2e1429e171284e51677fe0cd7bf90936c6e..020b8f9642117d68bfedf82d14067f3ce2035211 100644 (file)
--- 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 588ec83c32f8f3b3c0bfe41f011a0f9cc4bafacb..a007900927faec7e29766b3d156a1164ff7726f3 100644 (file)
--- 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 4f69af575c9e8c401526185ccd74bf9bbaba58ec..1855424fc103fd372d607ad4170c89e4c93eec6d 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,8 @@
+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'.

diff --git a/gettext-tools/m4/tmpdir.m4 b/gettext-tools/m4/tmpdir.m4
index 0eec7357d14eed71d1d9cbbbc4e0b7b56c3c282d..b06402e3e34bce99543704a6cd9d83b5c90fd580 100644 (file)
--- 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 c9dc9034ca987e1f77a6698203afb8b1a8d97aeb..50c19b9e91c2286831e019879136ba2a52333a43 100644 (file)
--- 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 403422137dc7f46335bc0a2427e9798a75142356..0511b18ba9bffce385b7724c71a2d5145fea49df 100644 (file)
--- 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 041450af864006a1c4ea5cf3cbc737aecf2ea565..43989cde2713b2c952c4d771e88cd224b8d06331 100644 (file)
--- 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