[Commits] r21777 - in /branches/eglibc-2_16: ./ libc/ libc/sysdeps/unix/sysv/linux/sys/ ports/sysdeps/arm/bits/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Sat Nov 17 17:52:10 2012
New Revision: 21777

Log:
Merge changes between r21353 and r21776 from /fsf/glibc-2_16-branch.

Modified:
    branches/eglibc-2_16/   (props changed)
    branches/eglibc-2_16/libc/ChangeLog
    branches/eglibc-2_16/libc/NEWS
    branches/eglibc-2_16/libc/sysdeps/unix/sysv/linux/sys/sysctl.h
    branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h   (props changed)

Propchange: branches/eglibc-2_16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 17 17:52:10 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_16-branch:19382-21353
+/fsf/glibc-2_16-branch:19382-21776
 /fsf/trunk:15224-19381

Modified: branches/eglibc-2_16/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_16/libc/ChangeLog (original)
+++ branches/eglibc-2_16/libc/ChangeLog Sat Nov 17 17:52:10 2012
@@ -1,3 +1,11 @@
+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>
 
 	[BZ #14648]

Modified: branches/eglibc-2_16/libc/NEWS
==============================================================================
--- branches/eglibc-2_16/libc/NEWS (original)
+++ branches/eglibc-2_16/libc/NEWS Sat Nov 17 17:52:10 2012
@@ -9,7 +9,7 @@
 
 * The following bugs are resolved with this release:
 
-  6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756
+  6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756, 14809
 
 Version 2.16
 

Modified: branches/eglibc-2_16/libc/sysdeps/unix/sysv/linux/sys/sysctl.h
==============================================================================
--- branches/eglibc-2_16/libc/sysdeps/unix/sysv/linux/sys/sysctl.h (original)
+++ branches/eglibc-2_16/libc/sysdeps/unix/sysv/linux/sys/sysctl.h Sat Nov 17 17:52:10 2012
@@ -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>
 

Propchange: branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 17 17:52:10 2012
@@ -1,3 +1,3 @@
-/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-21353
+/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-21776
 /fsf/trunk/ports/sysdeps/arm/bits/predefs.h:18166-19381
 /fsf/trunk/ports/sysdeps/arm/eabi/bits/predefs.h:15224-17813

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits