This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch release/2.15/master updated. glibc-2.15-47-gb9584b6


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, release/2.15/master has been updated
       via  b9584b603af976915f887de46f4ab9fb6c44b69b (commit)
      from  fc8c942ba4e4b41a0f1a62f6c22062596346b02c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b9584b603af976915f887de46f4ab9fb6c44b69b

commit b9584b603af976915f887de46f4ab9fb6c44b69b
Author: Andreas Schwab <schwab@suse.de>
Date:   Tue Nov 27 16:45:53 2012 +0100

    Revert "2012-11-07  Andreas Jaeger  <aj@suse.de>"
    
    This reverts commit fc8c942ba4e4b41a0f1a62f6c22062596346b02c.
    
    The issue has been fixed in the kernel.

diff --git a/ChangeLog b/ChangeLog
index 468ed2a..c9eaa23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,3 @@
-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-10-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14648]
diff --git a/NEWS b/NEWS
index d78a1f0..f26e2f4 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Version 2.15.1
 
   411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
   13749, 13753, 13771, 13774, 13786, 14048, 14059, 14167, 14273, 14459,
-  14621, 14648, 14809
+  14621, 14648
 
 Version 2.15
 
diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h
index 25ab7d0..110efaa 100644
--- a/sysdeps/unix/sysv/linux/sys/sysctl.h
+++ b/sysdeps/unix/sysv/linux/sys/sysctl.h
@@ -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
@@ -40,14 +40,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>
 
@@ -68,14 +60,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
 
 __BEGIN_DECLS
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                            |    8 --------
 NEWS                                 |    2 +-
 sysdeps/unix/sysv/linux/sys/sysctl.h |   18 +-----------------
 3 files changed, 2 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]