about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/sys
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2012-11-27 16:43:14 +0100
committerAndreas Schwab <schwab@suse.de>2012-11-28 16:19:03 +0100
commit4cc34c3511d1dae73381bdcd70657d92a62bee44 (patch)
tree593ffbe34106835e865314a54ae842f2cf72cec4 /sysdeps/unix/sysv/linux/sys
parent1bead169c32a3a688de863709b863207b7aafddd (diff)
downloadglibc-4cc34c3511d1dae73381bdcd70657d92a62bee44.tar.gz
glibc-4cc34c3511d1dae73381bdcd70657d92a62bee44.tar.xz
glibc-4cc34c3511d1dae73381bdcd70657d92a62bee44.zip
Revert "2012-11-07 Andreas Jaeger <aj@suse.de>"
This reverts commit 01f34a3bd8c087ca4be0bd24857e454c8d29f20b.

The issue has been fixed in the kernel.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sys')
-rw-r--r--sysdeps/unix/sysv/linux/sys/sysctl.h18
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 8b58905e77..cfa71ad27b 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
@@ -39,14 +39,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>
 
@@ -67,14 +59,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
 
 #include <bits/sysctl.h>