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 master updated. glibc-2.22-211-g81503d1

From: jsm28 at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 4 Sep 2015 16:21:40 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.22-211-g81503d1
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, master has been updated
       via  81503d1e4449fdb334ad343f4ddc05891c6b4190 (commit)
      from  0f4341fbec937b26b34e0ee80ab903825c0c76d0 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=81503d1e4449fdb334ad343f4ddc05891c6b4190

commit 81503d1e4449fdb334ad343f4ddc05891c6b4190
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Fri Sep 4 16:21:14 2015 +0000

    Rename bits/stdio-lock.h to stdio-lock.h (bug 14912).
    
    It was noted in
    <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the
    bits/*.h naming scheme should only be used for installed headers.
    This patch renames bits/stdio-lock.h to plain stdio-lock.h to follow
    that convention.
    
    Tested for x86_64 (testsuite, and that installed stripped shared
    libraries are unchanged by the patch).
    
    	[BZ #14912]
    	* bits/stdio-lock.h: Move to ...
    	* sysdeps/generic/stdio-lock.h: ...here.
    	(_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H.
    	* sysdeps/nptl/bits/stdio-lock.h: Move to ...
    	* sysdeps/nptl/stdio-lock.h: ...here.
    	(_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H.
    	* include/libio.h: Include <stdio-lock.h> instead of
    	<bits/stdio-lock.h>.
    	* sysdeps/nptl/fork.c: Likewise.
    	* sysdeps/pthread/flockfile.c: Likewise.
    	* sysdeps/pthread/ftrylockfile.c: Likewise.
    	* sysdeps/pthread/funlockfile.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index d583493..5bab613 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,20 @@
 2015-09-04  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #14912]
+	* bits/stdio-lock.h: Move to ...
+	* sysdeps/generic/stdio-lock.h: ...here.
+	(_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H.
+	* sysdeps/nptl/bits/stdio-lock.h: Move to ...
+	* sysdeps/nptl/stdio-lock.h: ...here.
+	(_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H.
+	* include/libio.h: Include <stdio-lock.h> instead of
+	<bits/stdio-lock.h>.
+	* sysdeps/nptl/fork.c: Likewise.
+	* sysdeps/pthread/flockfile.c: Likewise.
+	* sysdeps/pthread/ftrylockfile.c: Likewise.
+	* sysdeps/pthread/funlockfile.c: Likewise.
+
+	[BZ #14912]
 	* sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Move to ...
 	* sysdeps/unix/sysv/linux/m68k/m68k-vdso.h: ...here.
 	* sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h: Include
diff --git a/include/libio.h b/include/libio.h
index f8a346a..97fc5b5 100644
--- a/include/libio.h
+++ b/include/libio.h
@@ -1,5 +1,5 @@
 #if !defined _ISOMAC && defined _IO_MTSAFE_IO
-# include <bits/stdio-lock.h>
+# include <stdio-lock.h>
 #endif
 #include <libio/libio.h>
 
diff --git a/bits/stdio-lock.h b/sysdeps/generic/stdio-lock.h
similarity index 95%
rename from bits/stdio-lock.h
rename to sysdeps/generic/stdio-lock.h
index 0c5bb65..620e207 100644
--- a/bits/stdio-lock.h
+++ b/sysdeps/generic/stdio-lock.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_STDIO_LOCK_H
-#define _BITS_STDIO_LOCK_H 1
+#ifndef _STDIO_LOCK_H
+#define _STDIO_LOCK_H 1
 
 #include <bits/libc-lock.h>
 
@@ -54,4 +54,4 @@ __libc_lock_define_recursive (typedef, _IO_lock_t)
   _IO_cleanup_region_end (0)
 #endif
 
-#endif /* bits/stdio-lock.h */
+#endif /* stdio-lock.h */
diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
index 2b9ae4b..1e251bd 100644
--- a/sysdeps/nptl/fork.c
+++ b/sysdeps/nptl/fork.c
@@ -25,7 +25,7 @@
 #include <tls.h>
 #include <hp-timing.h>
 #include <ldsodefs.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 #include <atomic.h>
 #include <nptl/pthreadP.h>
 #include <fork.h>
diff --git a/sysdeps/nptl/bits/stdio-lock.h b/sysdeps/nptl/stdio-lock.h
similarity index 97%
rename from sysdeps/nptl/bits/stdio-lock.h
rename to sysdeps/nptl/stdio-lock.h
index 8adf031..9406eaa 100644
--- a/sysdeps/nptl/bits/stdio-lock.h
+++ b/sysdeps/nptl/stdio-lock.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_STDIO_LOCK_H
-#define _BITS_STDIO_LOCK_H 1
+#ifndef _STDIO_LOCK_H
+#define _STDIO_LOCK_H 1
 
 #include <bits/libc-lock.h>
 #include <lowlevellock.h>
@@ -107,4 +107,4 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
 
 #endif
 
-#endif /* bits/stdio-lock.h */
+#endif /* stdio-lock.h */
diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c
index c5c1ed8..3894656 100644
--- a/sysdeps/pthread/flockfile.c
+++ b/sysdeps/pthread/flockfile.c
@@ -19,7 +19,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 
 
 void
diff --git a/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c
index 14dc764..9ee0839 100644
--- a/sysdeps/pthread/ftrylockfile.c
+++ b/sysdeps/pthread/ftrylockfile.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <pthread.h>
 #include <stdio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 
 
 int
diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c
index 59172c3..d33f7b0 100644
--- a/sysdeps/pthread/funlockfile.c
+++ b/sysdeps/pthread/funlockfile.c
@@ -19,7 +19,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 
 
 void

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

Summary of changes:
 ChangeLog                              |   14 ++++++++++++++
 include/libio.h                        |    2 +-
 {bits => sysdeps/generic}/stdio-lock.h |    6 +++---
 sysdeps/nptl/fork.c                    |    2 +-
 sysdeps/nptl/{bits => }/stdio-lock.h   |    6 +++---
 sysdeps/pthread/flockfile.c            |    2 +-
 sysdeps/pthread/ftrylockfile.c         |    2 +-
 sysdeps/pthread/funlockfile.c          |    2 +-
 8 files changed, 25 insertions(+), 11 deletions(-)
 rename {bits => sysdeps/generic}/stdio-lock.h (95%)
 rename sysdeps/nptl/{bits => }/stdio-lock.h (97%)


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]