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 /sysdeps | |
| parent | fc8c942ba4e4b41a0f1a62f6c22062596346b02c (diff) | |
| download | glibc-b9584b603af976915f887de46f4ab9fb6c44b69b.zip glibc-b9584b603af976915f887de46f4ab9fb6c44b69b.tar.gz glibc-b9584b603af976915f887de46f4ab9fb6c44b69b.tar.bz2 | |
Revert "2012-11-07 Andreas Jaeger <aj@suse.de>"
This reverts commit fc8c942ba4e4b41a0f1a62f6c22062596346b02c.
The issue has been fixed in the kernel.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/sysctl.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h index 25ab7d0..110efaa 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 |