[Commits] r21698 - in /fsf/glibc-2_15-branch/libc: ChangeLog NEWS sysdeps/unix/sysv/linux/sys/sysctl.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Nov 14 00:05:06 2012
New Revision: 21698

Log:
Import glibc-2.15 for 2012-11-14

Modified:
    fsf/glibc-2_15-branch/libc/ChangeLog
    fsf/glibc-2_15-branch/libc/NEWS
    fsf/glibc-2_15-branch/libc/sysdeps/unix/sysv/linux/sys/sysctl.h

Modified: fsf/glibc-2_15-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_15-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_15-branch/libc/ChangeLog Wed Nov 14 00:05:06 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: fsf/glibc-2_15-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_15-branch/libc/NEWS (original)
+++ fsf/glibc-2_15-branch/libc/NEWS Wed Nov 14 00:05:06 2012
@@ -11,7 +11,7 @@
 
   411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
   13749, 13753, 13771, 13774, 13786, 14048, 14059, 14167, 14273, 14459,
-  14621, 14648
+  14621, 14648, 14809
 
 Version 2.15
 

Modified: fsf/glibc-2_15-branch/libc/sysdeps/unix/sysv/linux/sys/sysctl.h
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/unix/sysv/linux/sys/sysctl.h (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/unix/sysv/linux/sys/sysctl.h Wed Nov 14 00:05:06 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
@@ -40,6 +40,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>
 
@@ -60,6 +68,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
 
 __BEGIN_DECLS
 

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