aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--time/mktime.c6
2 files changed, 10 insertions, 3 deletions
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