GNU C Library master sources branch master updated. glibc-2.16-ports-merge-224-ge3b398f

[roland at sourceware dot org]

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  e3b398f925cf478a48c9de03326f7b5d9c12cc93 (commit)
      from  c91c505f222834b4e84ac7dcafab6deb08b49566 (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=e3b398f925cf478a48c9de03326f7b5d9c12cc93

commit e3b398f925cf478a48c9de03326f7b5d9c12cc93
Author: Roland McGrath <roland@hack.frob.com>
Date:   Fri Aug 17 14:16:12 2012 -0700

    Adjust old #include's of sysdeps/unix/time.c to point to sysdeps/posix/time.c instead.

diff --git a/ChangeLog b/ChangeLog
index 2b7fc94..eeab2bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
 
 	* sysdeps/unix/time.c: Moved ...
 	* sysdeps/posix/time.c: ... here.
+	* sysdeps/unix/sysv/linux/time.c: Adjust #include.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/time.c: Likewise.
 
 	* sysdeps/unix/nice.c: Moved ...
 	* sysdeps/posix/nice.c: ... here.
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/time.c b/sysdeps/unix/sysv/linux/sparc/sparc64/time.c
index 3a64ef1..509b580 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/time.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/time.c
@@ -1 +1 @@
-#include <sysdeps/unix/time.c>
+#include <sysdeps/posix/time.c>
diff --git a/sysdeps/unix/sysv/linux/time.c b/sysdeps/unix/sysv/linux/time.c
index f01d575..a73783e 100644
--- a/sysdeps/unix/sysv/linux/time.c
+++ b/sysdeps/unix/sysv/linux/time.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005-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
@@ -37,6 +37,6 @@ libc_hidden_def (time)
 
 #else
 
-# include <sysdeps/unix/time.c>
+# include <sysdeps/posix/time.c>
 
 #endif

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

Summary of changes:
 ChangeLog                                    |    2 ++
 sysdeps/unix/sysv/linux/sparc/sparc64/time.c |    2 +-
 sysdeps/unix/sysv/linux/time.c               |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)


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