GNU C Library master sources branch, master, updated. glibc-2.15-1002-g6226efb

[hjl 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  6226efbda1ee2950d53b830a7aab50cec7421c87 (commit)
       via  b99e4f783c20a35a33efd8b33362fc67b290dc94 (commit)
       via  643e01e6cbbcb37daa53e8020f099c9822615026 (commit)
       via  2554247d83080250693a60f9aca91820af4234e0 (commit)
       via  826dd0abdfe2b8ba1c4b4effb4c61ed4b405ff12 (commit)
       via  bd83aabe5a14f6e741c80b61f8d0d981baeb2e70 (commit)
       via  95770f140bf0c9ecb8ee3a9c00de5248e7e5cc61 (commit)
      from  0e44a77e481e18b56ef5bd2354fc97a267487551 (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=6226efbda1ee2950d53b830a7aab50cec7421c87

commit 6226efbda1ee2950d53b830a7aab50cec7421c87
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue May 22 06:14:01 2012 -0700

    mktime: merge comment-quoting-style change from gnulib

diff --git a/ChangeLog b/ChangeLog
index 9468ce4..46afce1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+	mktime: merge comment-quoting-style change from gnulib
+	* time/mktime.c: Quote 'like this' in comments.
+	The GNU coding standards suggest that we no longer quote `like this',
+	as "`" and "'" are typically rendered asymmetrically nowadays.
+	The typical gnulib style is to quote 'like this' when quoting
+	code, and "like this" when quoting English.
+
 	* time/mktime.c (compile-command): Add "-I.".
 
 	mktime: merge mktime-internal.h change from gnulib
diff --git a/time/mktime.c b/time/mktime.c
index 5567876..2ba64ea 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -1,4 +1,4 @@
-/* Convert a `struct tm' to a time_t value.
+/* Convert a 'struct tm' to a time_t value.
    Copyright (C) 1993-1999, 2002-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert <eggert@twinsun.com>.
@@ -26,7 +26,7 @@
 #endif
 
 /* Assume that leap seconds are possible, unless told otherwise.
-   If the host has a `zic' command with a `-L leapsecondfilename' option,
+   If the host has a 'zic' command with a '-L leapsecondfilename' option,
    then it supports leap seconds; otherwise it probably doesn't.  */
 #ifndef LEAP_SECONDS_POSSIBLE
 # define LEAP_SECONDS_POSSIBLE 1
@@ -509,7 +509,7 @@ mktime (struct tm *tp)
 {
 #ifdef _LIBC
   /* POSIX.1 8.1.1 requires that whenever mktime() is called, the
-     time zone names contained in the external variable `tzname' shall
+     time zone names contained in the external variable 'tzname' shall
      be set as if the tzset() function had been called.  */
   __tzset ();
 #endif

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

commit b99e4f783c20a35a33efd8b33362fc67b290dc94
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue May 22 06:13:01 2012 -0700

    time/mktime.c (compile-command): Add "-I."

diff --git a/ChangeLog b/ChangeLog
index 7cd5cb0..9468ce4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* time/mktime.c (compile-command): Add "-I.".
+
 	mktime: merge mktime-internal.h change from gnulib
 	* time/mktime.c [!_LIBC]: Include "mktime-internal.h".
 
diff --git a/time/mktime.c b/time/mktime.c
index 5a4f742..5567876 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -662,6 +662,6 @@ main (int argc, char **argv)
 
 /*
 Local Variables:
-compile-command: "gcc -DDEBUG -Wall -W -O -g mktime.c -o mktime"
+compile-command: "gcc -DDEBUG -I. -Wall -W -O2 -g mktime.c -o mktime"
 End:
 */

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=643e01e6cbbcb37daa53e8020f099c9822615026

commit 643e01e6cbbcb37daa53e8020f099c9822615026
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue May 22 06:11:29 2012 -0700

    mktime: merge mktime-internal.h change from gnulib

diff --git a/ChangeLog b/ChangeLog
index 1b957aa..7cd5cb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+	mktime: merge mktime-internal.h change from gnulib
+	* time/mktime.c [!_LIBC]: Include "mktime-internal.h".
+
 	mktime: merge time_r change from gnulib
 	* time/mktime.c [!_LIBC]: Do not include "time_r.h".
 
diff --git a/time/mktime.c b/time/mktime.c
index 15659d3..5a4f742 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -148,6 +148,7 @@ const unsigned short int __mon_yday[2][13] =
 # undef __localtime_r
 # define __localtime_r localtime_r
 # define __mktime_internal mktime_internal
+# include "mktime-internal.h"
 #endif
 
 /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) -

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2554247d83080250693a60f9aca91820af4234e0

commit 2554247d83080250693a60f9aca91820af4234e0
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue May 22 06:10:34 2012 -0700

    mktime: merge time_r change from gnulib

diff --git a/ChangeLog b/ChangeLog
index a148b39..1b957aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+	mktime: merge time_r change from gnulib
+	* time/mktime.c [!_LIBC]: Do not include "time_r.h".
+
 	mktime: merge DEBUG change from gnulib
 	* time/mktime.c (mktime) [DEBUG]: #undef before #define-ing, in
 	case system <time.h> has a #define.
diff --git a/time/mktime.c b/time/mktime.c
index d0b7738..15659d3 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -141,11 +141,10 @@ const unsigned short int __mon_yday[2][13] =
 
 
 #ifndef _LIBC
-/* Portable standalone applications should supply a "time_r.h" that
+/* Portable standalone applications should supply a <time.h> that
    declares a POSIX-compliant localtime_r, for the benefit of older
    implementations that lack localtime_r or have a nonstandard one.
    See the gnulib time_r module for one way to implement this.  */
-# include "time_r.h"
 # undef __localtime_r
 # define __localtime_r localtime_r
 # define __mktime_internal mktime_internal

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=826dd0abdfe2b8ba1c4b4effb4c61ed4b405ff12

commit 826dd0abdfe2b8ba1c4b4effb4c61ed4b405ff12
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue May 22 06:09:01 2012 -0700

    mktime: merge DEBUG change from gnulib

diff --git a/ChangeLog b/ChangeLog
index d33c223..a148b39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+	mktime: merge DEBUG change from gnulib
+	* time/mktime.c (mktime) [DEBUG]: #undef before #define-ing, in
+	case system <time.h> has a #define.
+
 	mktime: merge <sys/types.h> change from gnulib
 	* time/mktime.c: Do not include <sys/types.h>; no longer needed,
 	since <time.t> is now guaranteed to define time_t.
diff --git a/time/mktime.c b/time/mktime.c
index e4b3b66..d0b7738 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -42,6 +42,7 @@
 # include <stdio.h>
 # include <stdlib.h>
 /* Make it work even if the system's libc has its own mktime routine.  */
+# undef mktime
 # define mktime my_mktime
 #endif /* DEBUG */
 

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

commit bd83aabe5a14f6e741c80b61f8d0d981baeb2e70
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue May 22 06:07:58 2012 -0700

    mktime: merge <sys/types.h> change from gnulib

diff --git a/ChangeLog b/ChangeLog
index ad865fd..d33c223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+	mktime: merge <sys/types.h> change from gnulib
+	* time/mktime.c: Do not include <sys/types.h>; no longer needed,
+	since <time.t> is now guaranteed to define time_t.
+
 	mktime: merge HAVE_CONFIG_H change from gnulib
 	* time/mktime.c: Include <config.h> if !_LIBC, not if HAVE_CONFIG_H.
 
diff --git a/time/mktime.c b/time/mktime.c
index 0e5fde0..e4b3b66 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -32,7 +32,6 @@
 # define LEAP_SECONDS_POSSIBLE 1
 #endif
 
-#include <sys/types.h>		/* Some systems define `time_t' here.  */
 #include <time.h>
 
 #include <limits.h>

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=95770f140bf0c9ecb8ee3a9c00de5248e7e5cc61

commit 95770f140bf0c9ecb8ee3a9c00de5248e7e5cc61
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue May 22 06:05:37 2012 -0700

    mktime: merge HAVE_CONFIG_H change from gnulib

diff --git a/ChangeLog b/ChangeLog
index 200c726..ad865fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	mktime: merge HAVE_CONFIG_H change from gnulib
+	* time/mktime.c: Include <config.h> if !_LIBC, not if HAVE_CONFIG_H.
+
 2012-05-22  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/sysdep.h (SYSCALL_SET_ERRNO):
diff --git a/time/mktime.c b/time/mktime.c
index 683d468..0e5fde0 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -21,7 +21,7 @@
    mktime.  */
 /* #define DEBUG 1 */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 

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

Summary of changes:
 ChangeLog     |   28 ++++++++++++++++++++++++++++
 time/mktime.c |   16 ++++++++--------
 2 files changed, 36 insertions(+), 8 deletions(-)


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