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.16-ports-merge-196-g7c99b50


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  7c99b50ae4c722b4263fdd477305f27e1670bfa1 (commit)
      from  dd924cd7cc3ef8c9da103d883dd784815e388976 (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=7c99b50ae4c722b4263fdd477305f27e1670bfa1

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

Summary of changes:
 ChangeLog            |    2 ++
 rt/clock_nanosleep.c |    5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 66a0b71..2a67a37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-08-15  Roland McGrath  <roland@hack.frob.com>
 
+	* rt/clock_nanosleep.c: Include <time.h>, not <sys/time.h>.
+
 	* crypt/sha512.c (sha512_process_block) [!USE_TOTAL128]: Avoid
 	shifting LEN more than 31 bits at once.
 
diff --git a/rt/clock_nanosleep.c b/rt/clock_nanosleep.c
index 954a615..0b16ad2 100644
--- a/rt/clock_nanosleep.c
+++ b/rt/clock_nanosleep.c
@@ -1,5 +1,5 @@
 /* High-resolution sleep with the specified clock.  Stub version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000-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
@@ -17,8 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include <sys/time.h>
-
+#include <time.h>
 
 int
 clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,


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]