This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Remove duplicate #include <not-cancel.h> in Linux getsysstats.c
- From: Chris Metcalf <cmetcalf at tilera dot com>
- To: libc-alpha at sourceware dot org
- Date: Tue, 15 May 2012 18:26:01 +0000
- Subject: [PATCH] Remove duplicate #include <not-cancel.h> in Linux getsysstats.c
---
This causes a warning on tile, because we redefine open_not_cancel
in the linux-generic override, then include the standard Linux version.
The second time we #include <not-cancel.h> we get a warning from
re-defining the symbol. We could use inclusion guards as well,
but this file (like sysdep.h) doesn't generally seem to use one.
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/getsysstats.c | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5c24776..572bd96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-05-15 Chris Metcalf <cmetcalf@tilera.com>
+ * sysdeps/unix/sysv/linux/getsysstats.c: Remove duplicate
+ include of <not-cancel.h>.
+
+2012-05-15 Chris Metcalf <cmetcalf@tilera.com>
+
* math/libm-test.c: Support platforms without multiple rounding modes.
* math/bug-nextafter.c: Support platforms without FP exceptions.
* math/bug-nexttoward.c: Likewise.
diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
index 09603c0..22285f3 100644
--- a/sysdeps/unix/sysv/linux/getsysstats.c
+++ b/sysdeps/unix/sysv/linux/getsysstats.c
@@ -49,8 +49,6 @@
But not all systems have support for the /proc filesystem. If it
is not available we simply return 1 since there is no way. */
-#include <not-cancel.h>
-
/* Other architectures use different formats for /proc/cpuinfo. This
provides a hook for alternative parsers. */
--
1.7.1