+2012-09-21 Joseph Myers <joseph@codesourcery.com>
+
+ * libio/iopopen.c [_IO_HAVE_SYS_WAIT]: Make code unconditional.
+ [!_IO_HAVE_SYS_WAIT]: Remove conditional code.
+ * libio/libio.h (_IO_HAVE_SYS_WAIT): Remove.
+ * libio/oldiopopen.c [_IO_HAVE_SYS_WAIT]: Make code unconditional.
+ [!_IO_HAVE_SYS_WAIT]: Remove conditional code.
+ * sysdeps/generic/_G_config.h (_G_HAVE_SYS_WAIT): Remove.
+ * sysdeps/gnu/_G_config.h (_G_HAVE_SYS_WAIT): Likewise.
+ * sysdeps/mach/hurd/_G_config.h (_G_HAVE_SYS_WAIT): Likewise.
+
2012-09-20 Joseph Myers <joseph@codesourcery.com>
* libio/libio.h [_G_NEED_STDARG_H]: Make code unconditional.
# define _POSIX_SOURCE
#endif
#include "libioP.h"
-#if _IO_HAVE_SYS_WAIT
#include <signal.h>
#include <unistd.h>
#include <stdlib.h>
extern _IO_pid_t _IO_fork (void) __THROW;
#endif
-#endif /* _IO_HAVE_SYS_WAIT */
-
#ifndef _IO_dup2
#ifdef _LIBC
#define _IO_dup2 __dup2
const char *command;
const char *mode;
{
-#if _IO_HAVE_SYS_WAIT
int read_or_write;
int parent_end, child_end;
int pipe_fds[2];
_IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES);
return fp;
-#else /* !_IO_HAVE_SYS_WAIT */
- return NULL;
-#endif
}
_IO_FILE *
_IO_FILE *fp;
{
/* This is not name-space clean. FIXME! */
-#if _IO_HAVE_SYS_WAIT
int wstatus;
_IO_proc_file **ptr = &proc_file_chain;
_IO_pid_t wait_pid;
if (wait_pid == -1)
return -1;
return wstatus;
-#else /* !_IO_HAVE_SYS_WAIT */
- return -1;
-#endif
}
static const struct _IO_jump_t _IO_proc_jumps = {
#define _IO_pid_t _G_pid_t
#define _IO_uid_t _G_uid_t
#define _IO_iconv_t _G_iconv_t
-#define _IO_HAVE_SYS_WAIT _G_HAVE_SYS_WAIT
#define _IO_HAVE_ST_BLKSIZE _G_HAVE_ST_BLKSIZE
#define _IO_BUFSIZ _G_BUFSIZ
#define _IO_va_list _G_va_list
# define _POSIX_SOURCE
#endif
#include "libioP.h"
-#if _IO_HAVE_SYS_WAIT
#include <signal.h>
#include <unistd.h>
#include <stdlib.h>
extern _IO_pid_t _IO_fork (void) __THROW;
#endif
-#endif /* _IO_HAVE_SYS_WAIT */
-
#include <shlib-compat.h>
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
const char *command;
const char *mode;
{
-#if _IO_HAVE_SYS_WAIT
volatile int read_or_write;
volatile int parent_end, child_end;
int pipe_fds[2];
_IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES);
return fp;
-#else /* !_IO_HAVE_SYS_WAIT */
- return NULL;
-#endif
}
_IO_FILE *
_IO_FILE *fp;
{
/* This is not name-space clean. FIXME! */
-#if _IO_HAVE_SYS_WAIT
int wstatus;
_IO_proc_file **ptr = &old_proc_file_chain;
_IO_pid_t wait_pid;
if (wait_pid == -1)
return -1;
return wstatus;
-#else /* !_IO_HAVE_SYS_WAIT */
- return -1;
-#endif
}
const struct _IO_jump_t _IO_old_proc_jumps = {
/* These library features are always available in the GNU C library. */
-#define _G_HAVE_SYS_WAIT 1
#define _G_va_list __gnuc_va_list
#define _G_HAVE_MMAP 1
/* These library features are always available in the GNU C library. */
-#define _G_HAVE_SYS_WAIT 1
#define _G_va_list __gnuc_va_list
#define _G_HAVE_MMAP 1
/* These library features are always available in the GNU C library. */
-#define _G_HAVE_SYS_WAIT 1
#define _G_va_list __gnuc_va_list
#define _G_HAVE_MMAP 1