qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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-11-07 Roland McGrath <roland@hack.frob.com>
[BZ #14815]

2
NEWS
View File

@ -19,7 +19,7 @@ Version 2.17
14562, 14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610, 14621,
14638, 14645, 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716,
14743, 14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14805,
14807, 14811, 14815.
14807, 14809, 14811, 14815.
* Support for STT_GNU_IFUNC symbols added for s390 and s390x.
Optimized versions of memcpy, memset, and memcmp added for System z10 and

18
sysdeps/unix/sysv/linux/sys/sysctl.h
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>