Fix not-HAVE_SYMLINK code in zic.c.

tglsfdc · tglsfdc · commit 99f13d1617c9 · 2016-10-26T13:40:55.000-04:00
I broke this in commit f309492. 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.
diff --git 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
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -931,9 +931,11 @@ dolink(char const * fromfield, char const * tofield, bool staysymlink)`
`931`	`931`	`if (link_errno != ENOTSUP)`
`932`	`932`	`warning(_("copy used because hard link failed: %s"),`
`933`	`933`	`strerror(link_errno));`
	`934`	`+#ifdef HAVE_SYMLINK`
`934`	`935`	`else if (symlink_errno != ENOTSUP)`
`935`	`936`	`warning(_("copy used because symbolic link failed: %s"),`
`936`	`937`	`strerror(symlink_errno));`
	`938`	`+#endif`
`937`	`939`	`}`
`938`	`940`	`}`
`939`	`941`	`}`