This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-641-g01f34a3
- From: law at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 7 Nov 2012 18:59:08 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-641-g01f34a3
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 01f34a3bd8c087ca4be0bd24857e454c8d29f20b (commit)
from 03a8df301bb8df26bd4c58739dffaa4bb5f8c2d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=01f34a3bd8c087ca4be0bd24857e454c8d29f20b
commit 01f34a3bd8c087ca4be0bd24857e454c8d29f20b
Author: Jeff Law <law@redhat.com>
Date: Wed Nov 7 11:58:37 2012 -0700
2012-11-07 Andreas Jaeger <aj@suse.de>
[BZ #14809]
* sysdeps/unix/sysv/linux/sys/sysctl.h (_UAPI_LINUX_KERNEL_H)
(_UAPI_LINUX_TYPES_H): Starting with Linux 3.7, the include header
guards are changed. Only define if not yet defined, #undef back
after including linux/sysctl.h if defined here.
diff --git a/ChangeLog b/ChangeLog
index b7384c1..8634fb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-07 Andreas Jaeger <aj@suse.de>
+
+ [BZ #14809]
+ * sysdeps/unix/sysv/linux/sys/sysctl.h (_UAPI_LINUX_KERNEL_H)
+ (_UAPI_LINUX_TYPES_H): Starting with Linux 3.7, the include header
+ guards are changed. Only define if not yet defined, #undef back
+ after including linux/sysctl.h if defined here.
+
2012-11-07 Roland McGrath <roland@hack.frob.com>
[BZ #14815]
diff --git a/NEWS b/NEWS
index 6d4704d..f6af227 100644
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ Version 2.17
14562, 14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621,
14638, 14645, 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716,
14743, 14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14805,
- 14807, 14811, 14815.
+ 14807, 14809, 14811, 14815.
* Support for STT_GNU_IFUNC symbols added for s390 and s390x.
Optimized versions of memcpy, memset, and memcmp added for System z10 and
diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h
index cfa71ad..8b58905 100644
--- a/sysdeps/unix/sysv/linux/sys/sysctl.h
+++ b/sysdeps/unix/sysv/linux/sys/sysctl.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1999, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 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
@@ -39,6 +39,14 @@
# define __user
# define __undef__LINUX_COMPILER_H
#endif
+#ifndef _UAPI_LINUX_KERNEL_H
+# define _UAPI_LINUX_KERNEL_H
+# define __undef_UAPI_LINUX_KERNEL_H
+#endif
+#ifndef _UAPI_LINUX_TYPES_H
+# define _UAPI_LINUX_TYPES_H
+# define __undef_UAPI_LINUX_TYPES_H
+#endif
#include <linux/sysctl.h>
@@ -59,6 +67,14 @@
# undef __user
# undef __undef__LINUX_COMPILER_H
#endif
+#ifdef __undef_UAPI_LINUX_KERNEL_H
+# undef _UAPI_LINUX_KERNEL_H
+# undef __undef_UAPI_LINUX_KERNEL_H
+#endif
+#ifdef __undef_UAPI_LINUX_TYPES_H
+# undef _UAPI_LINUX_TYPES_H
+# undef __undef_UAPI_LINUX_TYPES_H
+#endif
#include <bits/sysctl.h>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
NEWS | 2 +-
sysdeps/unix/sysv/linux/sys/sysctl.h | 18 +++++++++++++++++-
3 files changed, 26 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources