about summary refs log tree commit diff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorJeff Law <law@redhat.com>2012-11-07 11:58:37 -0700
committerJeff Law <law@redhat.com>2012-11-07 11:58:37 -0700
commit01f34a3bd8c087ca4be0bd24857e454c8d29f20b (patch)
treea52b03da73f3b8533ce2480082beacc7655cd11c /sysdeps/unix/sysv
parent03a8df301bb8df26bd4c58739dffaa4bb5f8c2d1 (diff)
downloadglibc-01f34a3bd8c087ca4be0bd24857e454c8d29f20b.tar.gz
glibc-01f34a3bd8c087ca4be0bd24857e454c8d29f20b.tar.xz
glibc-01f34a3bd8c087ca4be0bd24857e454c8d29f20b.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.
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/sys/sysctl.h18
1 files changed, 17 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h
index cfa71ad27b..8b58905e77 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>