This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.15/master updated. glibc-2.15-46-gfc8c942
- From: aj at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 13 Nov 2012 08:23:08 -0000
- Subject: GNU C Library master sources branch release/2.15/master updated. glibc-2.15-46-gfc8c942
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, release/2.15/master has been updated
via fc8c942ba4e4b41a0f1a62f6c22062596346b02c (commit)
from 494251ab9fbd715731c444b7ad6b37c49653bc09 (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=fc8c942ba4e4b41a0f1a62f6c22062596346b02c
commit fc8c942ba4e4b41a0f1a62f6c22062596346b02c
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.
(cherry picked from commit 01f34a3bd8c087ca4be0bd24857e454c8d29f20b)
Conflicts:
ChangeLog
NEWS
diff --git a/ChangeLog b/ChangeLog
index c9eaa23..468ed2a 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-10-04 H.J. Lu <hongjiu.lu@intel.com>
[BZ #14648]
diff --git a/NEWS b/NEWS
index f26e2f4..d78a1f0 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Version 2.15.1
411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
13749, 13753, 13771, 13774, 13786, 14048, 14059, 14167, 14273, 14459,
- 14621, 14648
+ 14621, 14648, 14809
Version 2.15
diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h
index 110efaa..25ab7d0 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
@@ -40,6 +40,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>
@@ -60,6 +68,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
__BEGIN_DECLS
-----------------------------------------------------------------------
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