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:22:33 +0100 |
| commit | fc8c942ba4e4b41a0f1a62f6c22062596346b02c (patch) | |
| tree | be654adf22bae65a8527fb5f62a212676ed49789 | |
| parent | 494251ab9fbd715731c444b7ad6b37c49653bc09 (diff) | |
| download | glibc-fc8c942ba4e4b41a0f1a62f6c22062596346b02c.tar.gz glibc-fc8c942ba4e4b41a0f1a62f6c22062596346b02c.tar.xz glibc-fc8c942ba4e4b41a0f1a62f6c22062596346b02c.zip | |
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
| -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
diff --git a/ChangeLog b/ChangeLog index c9eaa23430..468ed2a2d3 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 f26e2f4bd6..d78a1f0a40 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 110efaa769..25ab7d0371 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 |