1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

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.
This commit is contained in:
Jeff Law
2012-11-07 11:58:37 -07:00
parent 03a8df301b
commit 01f34a3bd8
3 changed files with 26 additions and 2 deletions

View File

@ -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>