summaryrefslogtreecommitdiff
path: root/src/timezone/localtime.c
diff options
context:
space:
mode:
authorTom Lane2018-05-04 16:26:25 +0000
committerTom Lane2018-05-04 16:26:25 +0000
commitb45f6613e0a475f908d93dbaa8612ccb9395f666 (patch)
tree699e422b002f519cee1d3e3f8f80faf1a2480215 /src/timezone/localtime.c
parent59cb323053f4ed582d4e71acaeb5770603f074db (diff)
Sync our copy of the timezone library with IANA release tzcode2018e.
The non-cosmetic changes involve teaching the "zic" tzdata compiler about negative DST. While I'm not currently intending that we start using negative-DST data right away, it seems possible that somebody would try to use our copy of zic with bleeding-edge IANA data. So we'd better be out in front of this change code-wise, even though it doesn't matter for the data file we're shipping. Discussion: https://postgr.es/m/30996.1525445902@sss.pgh.pa.us
Diffstat (limited to 'src/timezone/localtime.c')
-rw-r--r--src/timezone/localtime.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c
index 2b5b3a924f..31b06b037f 100644
--- a/src/timezone/localtime.c
+++ b/src/timezone/localtime.c
@@ -60,9 +60,8 @@ static int tzdefrules_loaded = 0;
/*
* The DST rules to use if TZ has no rules and we can't load TZDEFRULES.
* Default to US rules as of 2017-05-07.
- * POSIX 1003.1 section 8.1.1 says that the default DST rules are
- * implementation dependent; for historical reasons, US rules are a
- * common default.
+ * POSIX does not specify the default DST rules;
+ * for historical reasons, US rules are a common default.
*/
#define TZDEFRULESTRING ",M3.2.0,M11.1.0"
@@ -1158,10 +1157,11 @@ tzparse(const char *name, struct state *sp, bool lastditch)
else
{
/*
- * If summer time is in effect, and the transition time
- * was not specified as standard time, add the summer time
- * offset to the transition time; otherwise, add the
- * standard time offset to the transition time.
+ * If daylight saving time is in effect, and the
+ * transition time was not specified as standard time, add
+ * the daylight saving time offset to the transition time;
+ * otherwise, add the standard time offset to the
+ * transition time.
*/
/*