diff options
author | Jeff Law <law@redhat.com> | 2012-11-07 11:58:37 -0700 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2012-11-13 09:01:25 +0100 |
commit | 68b6636fdc3d5b940d9be060e1f429b6eaa93709 (patch) | |
tree | 3346ae40105fbaa113c110d93d1f3bd4316f2f3b | |
parent | c3b96f90c9c1f0b537fdf0424e8ccc61989cd8ee (diff) | |
download | glibc-68b6636fdc3d5b940d9be060e1f429b6eaa93709.zip glibc-68b6636fdc3d5b940d9be060e1f429b6eaa93709.tar.gz glibc-68b6636fdc3d5b940d9be060e1f429b6eaa93709.tar.bz2 |
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:
NEWS
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sys/sysctl.h | 18 |
3 files changed, 26 insertions, 2 deletions
@@ -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] @@ -9,7 +9,7 @@ Version 2.16.1 * The following bugs are resolved with this release: - 6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756 + 6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14809 Version 2.16 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> |