Cygwin: convert localtime_wrapper.c to plain C source

That also requires a small tweak to localtime.c.patch, otherwise
GCC complains about the position of the 'trydefrules' label.
Also, simplify includes.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2020-05-25 13:50:36 +02:00
parent 57625ac256
commit 49a843b407
3 changed files with 18 additions and 22 deletions

View File

@ -32,13 +32,15 @@
nread = read(fid, up->buf, sizeof up->buf);
if (nread < (ssize_t)tzheadsize) {
int err = nread < 0 ? errno : EINVAL;
@@ -501,6 +501,15 @@
@@ -501,6 +501,17 @@
}
if (close(fid) < 0)
return errno;
+ if (0) {
+ const char *base;
+trydefrules:
+ const char *base = strrchr(name, '/');
+
+ base = strrchr(name, '/');
+ base = base ? base + 1 : name;
+ if (strcmp(base, TZDEFRULES))
+ return errno;
@ -48,7 +50,7 @@
for (stored = 4; stored <= 8; stored *= 2) {
int_fast32_t ttisstdcnt = detzcode(up->tzhead.tzh_ttisstdcnt);
int_fast32_t ttisutcnt = detzcode(up->tzhead.tzh_ttisutcnt);
@@ -1417,6 +1426,8 @@
@@ -1417,6 +1428,8 @@
tzsetlcl(char const *name)
{
struct state *sp = __lclptr;