From: Bruno Haible <bruno@clisp.org>
Date: Sun, 5 Oct 2008 14:58:03 +0000 (+0200)
Subject: Use getdtablesize module.
X-Git-Tag: v0.1~6898
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=eaff1728aebaf49a7bc6f1c8ff7bc85025fe1151;p=gnulib.git

Use getdtablesize module.
---

diff --git a/ChangeLog b/ChangeLog
index f21c6fb69..70a415292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 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.
 	* tests/test-getdtablesize.c: New file.
 
diff --git a/lib/spawn_faction_addclose.c b/lib/spawn_faction_addclose.c
index d2a03e81a..356604722 100644
--- 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 e86196009..688873fda 100644
--- 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 08482ba19..2f63bc3c2 100644
--- 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 865e6c508..b85eacfdb 100644
--- 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 3b8a7a012..35a67e85d 100644
--- 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 99656ce4d..c715c71cd 100644
--- 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