diff options
| author | Andreas Schwab <schwab@suse.de> | 2012-11-27 16:45:53 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2012-11-27 16:45:53 +0100 |
| commit | b9584b603af976915f887de46f4ab9fb6c44b69b (patch) | |
| tree | 153a2a342c29ab1cf8bcafc7c7134a4a1aecfae9 | |
| parent | fc8c942ba4e4b41a0f1a62f6c22062596346b02c (diff) | |
| download | glibc-b9584b603af976915f887de46f4ab9fb6c44b69b.tar.gz glibc-b9584b603af976915f887de46f4ab9fb6c44b69b.tar.xz glibc-b9584b603af976915f887de46f4ab9fb6c44b69b.zip | |
Revert "2012-11-07 Andreas Jaeger <aj@suse.de>"
This reverts commit fc8c942ba4e4b41a0f1a62f6c22062596346b02c. The issue has been fixed in the kernel.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/sysctl.h | 18 |
3 files changed, 2 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog index 468ed2a2d3..c9eaa23430 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,3 @@ -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 d78a1f0a40..f26e2f4bd6 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, 14809 + 14621, 14648 Version 2.15 diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h index 25ab7d0371..110efaa769 100644 --- a/sysdeps/unix/sysv/linux/sys/sysctl.h +++ b/sysdeps/unix/sysv/linux/sys/sysctl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2012 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1999, 2002, 2003, 2004 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,14 +40,6 @@ # 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> @@ -68,14 +60,6 @@ # 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 |