From 43d12fdaef7e1411517f9b01b11eeba38953aaf4 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 6 Dec 2011 10:56:59 -0700 Subject: [PATCH] - Mark fortified __FD_ELT as extension - Fix typo in manual (#708455) --- glibc-fdelt.patch | 33 +++++++++++++++++++++++++++++++++ glibc-rh708455.patch | 13 +++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 glibc-fdelt.patch create mode 100644 glibc-rh708455.patch diff --git a/glibc-fdelt.patch b/glibc-fdelt.patch new file mode 100644 index 0000000..4b26722 --- /dev/null +++ b/glibc-fdelt.patch @@ -0,0 +1,33 @@ +commit d4cc29a254db6bd3838aac79d9d0e91cfd467c9d +Author: Andreas Schwab +Date: Fri Dec 2 11:34:28 2011 +0100 + + Mark fortified __FD_ELT as extension + +diff --git a/ChangeLog b/ChangeLog +index dddb628..e512bbb 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2011-12-02 Andreas Schwab ++ ++ * misc/bits/select2.h (__FD_ELT): Mark as extension. Add ++ parenthesis. ++ + 2011-11-29 Andreas Schwab + + * locale/weight.h (findidx): Add parameter len. +diff --git a/misc/bits/select2.h b/misc/bits/select2.h +index 37c4827..a7ce1b4 100644 +--- a/misc/bits/select2.h ++++ b/misc/bits/select2.h +@@ -27,7 +27,8 @@ extern unsigned long int __fdelt_warn (unsigned long int __d) + __warnattr ("bit outside of fd_set selected"); + #undef __FD_ELT + #define __FD_ELT(d) \ +- ({ unsigned long int __d = d; \ ++ __extension__ \ ++ ({ unsigned long int __d = (d); \ + (__builtin_constant_p (__d) \ + ? (__d >= __FD_SETSIZE \ + ? __fdelt_warn (__d) : (__d / __NFDBITS)) \ diff --git a/glibc-rh708455.patch b/glibc-rh708455.patch new file mode 100644 index 0000000..efc8116 --- /dev/null +++ b/glibc-rh708455.patch @@ -0,0 +1,13 @@ +diff --git a/manual/resource.texi b/manual/resource.texi +index 0549572..8e3155c 100644 +--- a/manual/resource.texi ++++ b/manual/resource.texi +@@ -1607,7 +1607,7 @@ processors and so the call + @end smallexample + + @noindent +-returns the number of processors which are currently inline (i.e., ++returns the number of processors which are currently online (i.e., + available). + + For these two pieces of information the GNU C library also provides