Use getdtablesize module.

diff --git a/ChangeLog b/ChangeLog
index f21c6fb69d3664aab00eeeb747d68584e91baeeb..70a415292da09b480d62ee76971b04389ae22092 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-10-05  Bruno Haible  <bruno@clisp.org>
+
+       * lib/spawn_faction_addclose.c (__sysconf): Use getdtablesize always.
+       * lib/spawn_faction_adddup2.c (__sysconf): Likewise.
+       * lib/spawn_faction_addopen.c (__sysconf): Likewise.
+       * modules/posix_spawn_file_actions_addclose (Depends-on): Add
+       getdtablesize.
+       * modules/posix_spawn_file_actions_adddup2 (Depends-on): Likewise.
+       * modules/posix_spawn_file_actions_addopen (Depends-on): Likewise.
+
 2008-10-05  Bruno Haible  <bruno@clisp.org>
 
        * modules/getdtablesize-tests: New file.

diff --git a/lib/spawn_faction_addclose.c b/lib/spawn_faction_addclose.c
index d2a03e81aa1b67ce25dfb4eddf60da5888af37ac..356604722119490c44c1f5c51a108bbe2d3f06e6 100644 (file)
--- a/lib/spawn_faction_addclose.c
+++ b/lib/spawn_faction_addclose.c
@@ -23,12 +23,7 @@
 #include <unistd.h>
 
 #if !_LIBC
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-#  include <stdio.h>
-#  define __sysconf(open_max) _getmaxstdio ()
-# else
-#  define __sysconf(open_max) getdtablesize ()
-# endif
+# define __sysconf(open_max) getdtablesize ()
 #endif
 
 #include "spawn_int.h"

diff --git a/lib/spawn_faction_adddup2.c b/lib/spawn_faction_adddup2.c
index e86196009935e25b793bbc12cb426b66e0cb1700..688873fda48d13d3230d8aadef2b7bb11e4f4892 100644 (file)
--- a/lib/spawn_faction_adddup2.c
+++ b/lib/spawn_faction_adddup2.c
@@ -23,12 +23,7 @@
 #include <unistd.h>
 
 #if !_LIBC
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-#  include <stdio.h>
-#  define __sysconf(open_max) _getmaxstdio ()
-# else
-#  define __sysconf(open_max) getdtablesize ()
-# endif
+# define __sysconf(open_max) getdtablesize ()
 #endif
 
 #include "spawn_int.h"

diff --git a/lib/spawn_faction_addopen.c b/lib/spawn_faction_addopen.c
index 08482ba192b6f06fb204741cef366c55b5951b58..2f63bc3c2ca9108389b20b8515420008ced79e6d 100644 (file)
--- a/lib/spawn_faction_addopen.c
+++ b/lib/spawn_faction_addopen.c
@@ -23,12 +23,7 @@
 #include <unistd.h>
 
 #if !_LIBC
-# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-#  include <stdio.h>
-#  define __sysconf(open_max) _getmaxstdio ()
-# else
-#  define __sysconf(open_max) getdtablesize ()
-# endif
+# define __sysconf(open_max) getdtablesize ()
 #endif
 
 #include "spawn_int.h"

diff --git a/modules/posix_spawn_file_actions_addclose b/modules/posix_spawn_file_actions_addclose
index 865e6c508aa5ce3b06a0cd625666d0af8f44169a..b85eacfdb9ddff3dd96c0623db42cc6311608b10 100644 (file)
--- a/modules/posix_spawn_file_actions_addclose
+++ b/modules/posix_spawn_file_actions_addclose
@@ -9,6 +9,7 @@ m4/posix_spawn.m4
 
 Depends-on:
 spawn
+getdtablesize
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawn_file_actions_adddup2 b/modules/posix_spawn_file_actions_adddup2
index 3b8a7a0124fe8143f34aab574318e10269933cb2..35a67e85d0a5a439eca86007c0f981ce81773113 100644 (file)
--- a/modules/posix_spawn_file_actions_adddup2
+++ b/modules/posix_spawn_file_actions_adddup2
@@ -9,6 +9,7 @@ m4/posix_spawn.m4
 
 Depends-on:
 spawn
+getdtablesize
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawn_file_actions_addopen b/modules/posix_spawn_file_actions_addopen
index 99656ce4dce9bd3e8695509bdb739baacfb93027..c715c71cd8af00c4d78500a50c4c2cf8f8f40f6d 100644 (file)
--- a/modules/posix_spawn_file_actions_addopen
+++ b/modules/posix_spawn_file_actions_addopen
@@ -9,6 +9,7 @@ m4/posix_spawn.m4
 
 Depends-on:
 spawn
+getdtablesize
 
 configure.ac:
 gl_POSIX_SPAWN