[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r21890 - in /fsf/glibc-2_16-branch/libc: ChangeLog NEWS sysdeps/unix/sysv/linux/sys/sysctl.h
- To: commits@xxxxxxxxxx
- Subject: [Commits] r21890 - in /fsf/glibc-2_16-branch/libc: ChangeLog NEWS sysdeps/unix/sysv/linux/sys/sysctl.h
- From: eglibc@xxxxxxxxxx
- Date: Thu, 29 Nov 2012 00:02:31 -0000
Author: eglibc
Date: Thu Nov 29 00:02:29 2012
New Revision: 21890
Log:
Import glibc-2.16 for 2012-11-29
Modified:
fsf/glibc-2_16-branch/libc/ChangeLog
fsf/glibc-2_16-branch/libc/NEWS
fsf/glibc-2_16-branch/libc/sysdeps/unix/sysv/linux/sys/sysctl.h
Modified: fsf/glibc-2_16-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_16-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_16-branch/libc/ChangeLog Thu Nov 29 00:02:29 2012
@@ -15,14 +15,6 @@
(ELF_MACHINE_RUNTIME_FIXUP_PARAMS): Issue an error if it isn't
defined and ELF_MACHINE_RUNTIME_FIXUP_ARGS is defined.
* elf/tst-audit8.c: New file.
-
-2012-11-07 Andreas Jaeger <aj@xxxxxxx>
-
- [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-10-04 H.J. Lu <hongjiu.lu@xxxxxxxxx>
Modified: fsf/glibc-2_16-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_16-branch/libc/NEWS (original)
+++ fsf/glibc-2_16-branch/libc/NEWS Thu Nov 29 00:02:29 2012
@@ -9,7 +9,7 @@
* The following bugs are resolved with this release:
- 6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14809, 14831
+ 6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14831
Version 2.16
Modified: fsf/glibc-2_16-branch/libc/sysdeps/unix/sysv/linux/sys/sysctl.h
==============================================================================
--- fsf/glibc-2_16-branch/libc/sysdeps/unix/sysv/linux/sys/sysctl.h (original)
+++ fsf/glibc-2_16-branch/libc/sysdeps/unix/sysv/linux/sys/sysctl.h Thu Nov 29 00:02:29 2012
@@ -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>
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits