aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2016-10-26 13:40:41 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2016-10-26 13:41:03 -0400
commit59f5b61cce3cfdfca3dc1a3f68307a47156d6a97 (patch)
tree92feee46f668c813d7006c347ca29cbd19fe90b4
parentafb10b3b298c1012908a7d0f491a6a852c64e38d (diff)
downloadpostgresql-59f5b61cce3cfdfca3dc1a3f68307a47156d6a97.tar.gz
postgresql-59f5b61cce3cfdfca3dc1a3f68307a47156d6a97.zip
Fix not-HAVE_SYMLINK code in zic.c.
I broke this in commit f3094920a. Apparently it's dead code anyway, at least as far as our buildfarm is concerned (and the upstream IANA code doesn't worry at all about symlink() not being present). But as long as the rest of our code is willing to guard against not having symlink(), this should too. Noted while investigating a tangentially-related complaint from Sandeep Thakkar. Back-patch to keep branches in sync.
-rw-r--r--src/timezone/zic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index d624b23a8eb..64adb6bd465 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -931,9 +931,11 @@ dolink(char const * fromfield, char const * tofield, bool staysymlink)
if (link_errno != ENOTSUP)
warning(_("copy used because hard link failed: %s"),
strerror(link_errno));
+#ifdef HAVE_SYMLINK
else if (symlink_errno != ENOTSUP)
warning(_("copy used because symbolic link failed: %s"),
strerror(symlink_errno));
+#endif
}
}
}