diff options
| author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2012-01-11 14:37:16 -0600 |
|---|---|---|
| committer | Ryan S. Arnold <rsa@linux.vnet.ibm.com> | 2012-01-11 14:37:26 -0600 |
| commit | eea213be41a4f37ff42bd3e905f2323091d234e0 (patch) | |
| tree | d9f9d2a7acf6913cf7638c262abd5ee211db5778 | |
| parent | 0a08973fdfd081e959b3c42f8f95d27badb46423 (diff) | |
| parent | 81552be4dfba9fc0a253a072b88cdd1062172d3e (diff) | |
| download | glibc-eea213be41a4f37ff42bd3e905f2323091d234e0.tar.gz | |
Merge Adhemerval Zanella's pipe2 fix into ibm/2.12/master.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/unistd.h | 5 | ||||
| -rw-r--r-- | io/Makefile | 2 | ||||
| -rw-r--r-- | io/have_pipe2.c | 24 |
4 files changed, 32 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2011-12-28 Adhemerval Zanella <azanella@linux.vnet.ibm.com> + + * include/unistd.h: Defining __have_pipe2 as external variable. + * io/Makefile: Added have_pipe2 object. + * io/have_pipe2.c: Declaring __have_pipe2 variable. + 2011-11-16 Adhemerval Zanella <azanella@linux.vnet.ibm.com> * sysdeps/powerpc/Makefile: Added locale-defines.sym generation. diff --git a/include/unistd.h b/include/unistd.h index 0ad2983280..6b7aa7920c 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -171,10 +171,7 @@ extern int __libc_pause (void); extern int __pause_nocancel (void) attribute_hidden; extern int __have_sock_cloexec; -/* At lot of other functionality became available at the same time as - SOCK_CLOEXEC. Avoid defining separate variables for all of them - unless it is really necessary. */ -#define __have_pipe2 __have_sock_cloexec +extern int __have_pipe2; extern int __getlogin_r_loginuid (char *name, size_t namesize) attribute_hidden; diff --git a/io/Makefile b/io/Makefile index caaa51b351..de33202ec5 100644 --- a/io/Makefile +++ b/io/Makefile @@ -54,7 +54,7 @@ routines := \ sendfile sendfile64 \ utimensat futimens -aux := have_o_cloexec +aux := have_o_cloexec have_pipe2 # These routines will be omitted from the libc shared object. # Instead the static object files will be included in a special archive diff --git a/io/have_pipe2.c b/io/have_pipe2.c new file mode 100644 index 0000000000..f08efa8aff --- /dev/null +++ b/io/have_pipe2.c @@ -0,0 +1,24 @@ +/* Copyright (C) 2011 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <unistd.h> +#include <kernel-features.h> + +#ifndef __ASSUME_PIPE2 +int __have_pipe2; +#endif |