AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove _G_HAVE_SYS_WAIT and _IO_HAVE_SYS_WAIT.

Browse Source
This commit is contained in:
Joseph Myers 2012-09-21 10:02:03 +00:00
parent 8a26625d21
commit 431531094f
7 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
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> 2012-09-20 Joseph Myers <joseph@codesourcery.com>
* libio/libio.h [_G_NEED_STDARG_H]: Make code unconditional. * libio/libio.h [_G_NEED_STDARG_H]: Make code unconditional.

11
libio/iopopen.c
View File

@ -29,7 +29,6 @@
# define _POSIX_SOURCE # define _POSIX_SOURCE
#endif #endif
#include "libioP.h" #include "libioP.h"
#if _IO_HAVE_SYS_WAIT
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
@ -51,8 +50,6 @@
extern _IO_pid_t _IO_fork (void) __THROW; extern _IO_pid_t _IO_fork (void) __THROW;
#endif #endif
#endif /* _IO_HAVE_SYS_WAIT */
#ifndef _IO_dup2 #ifndef _IO_dup2
#ifdef _LIBC #ifdef _LIBC
#define _IO_dup2 __dup2 #define _IO_dup2 __dup2
@ -114,7 +111,6 @@ _IO_new_proc_open (fp, command, mode)
const char *command; const char *command;
const char *mode; const char *mode;
{ {
#if _IO_HAVE_SYS_WAIT
int read_or_write; int read_or_write;
int parent_end, child_end; int parent_end, child_end;
int pipe_fds[2]; int pipe_fds[2];
@ -273,9 +269,6 @@ _IO_new_proc_open (fp, command, mode)
_IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES); _IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES);
return fp; return fp;
#else /* !_IO_HAVE_SYS_WAIT */
return NULL;
#endif
} }
_IO_FILE * _IO_FILE *
@ -317,7 +310,6 @@ _IO_new_proc_close (fp)
_IO_FILE *fp; _IO_FILE *fp;
{ {
/* This is not name-space clean. FIXME! */ /* This is not name-space clean. FIXME! */
#if _IO_HAVE_SYS_WAIT
int wstatus; int wstatus;
_IO_proc_file **ptr = &proc_file_chain; _IO_proc_file **ptr = &proc_file_chain;
_IO_pid_t wait_pid; _IO_pid_t wait_pid;
@ -356,9 +348,6 @@ _IO_new_proc_close (fp)
if (wait_pid == -1) if (wait_pid == -1)
return -1; return -1;
return wstatus; return wstatus;
#else /* !_IO_HAVE_SYS_WAIT */
return -1;
#endif
} }
static const struct _IO_jump_t _IO_proc_jumps = { static const struct _IO_jump_t _IO_proc_jumps = {

1
libio/libio.h
View File

@ -41,7 +41,6 @@
#define _IO_pid_t _G_pid_t #define _IO_pid_t _G_pid_t
#define _IO_uid_t _G_uid_t #define _IO_uid_t _G_uid_t
#define _IO_iconv_t _G_iconv_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_HAVE_ST_BLKSIZE _G_HAVE_ST_BLKSIZE
#define _IO_BUFSIZ _G_BUFSIZ #define _IO_BUFSIZ _G_BUFSIZ
#define _IO_va_list _G_va_list #define _IO_va_list _G_va_list

11
libio/oldiopopen.c
View File

@ -30,7 +30,6 @@
# define _POSIX_SOURCE # define _POSIX_SOURCE
#endif #endif
#include "libioP.h" #include "libioP.h"
#if _IO_HAVE_SYS_WAIT
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
@ -49,8 +48,6 @@
extern _IO_pid_t _IO_fork (void) __THROW; extern _IO_pid_t _IO_fork (void) __THROW;
#endif #endif
#endif /* _IO_HAVE_SYS_WAIT */
#include <shlib-compat.h> #include <shlib-compat.h>
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
@ -123,7 +120,6 @@ _IO_old_proc_open (fp, command, mode)
const char *command; const char *command;
const char *mode; const char *mode;
{ {
#if _IO_HAVE_SYS_WAIT
volatile int read_or_write; volatile int read_or_write;
volatile int parent_end, child_end; volatile int parent_end, child_end;
int pipe_fds[2]; int pipe_fds[2];
@ -194,9 +190,6 @@ _IO_old_proc_open (fp, command, mode)
_IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES); _IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES);
return fp; return fp;
#else /* !_IO_HAVE_SYS_WAIT */
return NULL;
#endif
} }
_IO_FILE * _IO_FILE *
@ -240,7 +233,6 @@ _IO_old_proc_close (fp)
_IO_FILE *fp; _IO_FILE *fp;
{ {
/* This is not name-space clean. FIXME! */ /* This is not name-space clean. FIXME! */
#if _IO_HAVE_SYS_WAIT
int wstatus; int wstatus;
_IO_proc_file **ptr = &old_proc_file_chain; _IO_proc_file **ptr = &old_proc_file_chain;
_IO_pid_t wait_pid; _IO_pid_t wait_pid;
@ -279,9 +271,6 @@ _IO_old_proc_close (fp)
if (wait_pid == -1) if (wait_pid == -1)
return -1; return -1;
return wstatus; return wstatus;
#else /* !_IO_HAVE_SYS_WAIT */
return -1;
#endif
} }
const struct _IO_jump_t _IO_old_proc_jumps = { const struct _IO_jump_t _IO_old_proc_jumps = {

1
sysdeps/generic/_G_config.h
View File

@ -52,7 +52,6 @@ typedef union
/* These library features are always available in the GNU C library. */ /* 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_va_list __gnuc_va_list
#define _G_HAVE_MMAP 1 #define _G_HAVE_MMAP 1

1
sysdeps/gnu/_G_config.h
View File

@ -52,7 +52,6 @@ typedef union
/* These library features are always available in the GNU C library. */ /* 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_va_list __gnuc_va_list
#define _G_HAVE_MMAP 1 #define _G_HAVE_MMAP 1

1
sysdeps/mach/hurd/_G_config.h
View File

@ -52,7 +52,6 @@ typedef union
/* These library features are always available in the GNU C library. */ /* 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_va_list __gnuc_va_list
#define _G_HAVE_MMAP 1 #define _G_HAVE_MMAP 1