public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: localtime.cc: reformat for easier patching Date: Mon, 4 May 2020 09:20:21 +0000 (GMT) [thread overview] Message-ID: <20200504092021.2D3D0383F84B@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=f2e06d8af5f390d81b64375a69ca834ca19d6029 commit f2e06d8af5f390d81b64375a69ca834ca19d6029 Author: Corinna Vinschen <corinna@vinschen.de> Date: Mon Apr 27 11:13:05 2020 +0200 Cygwin: localtime.cc: reformat for easier patching Signed-off-by: Corinna Vinschen <corinna@vinschen.de> Diff: --- winsup/cygwin/localtime.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/winsup/cygwin/localtime.cc b/winsup/cygwin/localtime.cc index 010376637..40054e332 100644 --- a/winsup/cygwin/localtime.cc +++ b/winsup/cygwin/localtime.cc @@ -1,17 +1,17 @@ /* $NetBSD: localtime.c,v 1.72 2012/10/28 19:02:29 christos Exp $ */ -/* Don't reformat the code arbitrarily. - - It uses in wide parts the exact formatting as the upstream NetBSD - versions. The purpose is to simplify subsequent diffs to the NetBSD - version, should the need arise again at one point. */ - /* ** This file is in the public domain, so clarified as of ** 1996-06-05 by Arthur David Olson. */ /* Temporarily merged private.h and tzfile.h for ease of management - DJ */ +/* Don't reformat the code arbitrarily. + + It uses in wide parts the exact formatting as the upstream NetBSD + versions. The purpose is to simplify subsequent diffs to the NetBSD + version, should the need arise again at one point. */ + #include "winsup.h" #include "cygerrno.h" #include "sync.h" @@ -437,8 +437,6 @@ struct __state { struct lsinfo lsis[TZ_MAX_LEAPS]; }; -typedef struct __state *timezone_t; - struct rule { int r_type; /* type of rule--see below */ int r_day; /* day number of rule */ @@ -451,6 +449,10 @@ struct rule { #define DAY_OF_YEAR 1 /* n - day of year */ #define MONTH_NTH_DAY_OF_WEEK 2 /* Mm.n.d - month, week, day of week */ +#ifdef __CYGWIN__ +typedef struct __state *timezone_t; +#endif + typedef struct tm *(*subfun_t)(const timezone_t sp, const time_t *timep, long offset, struct tm *tmp);
reply other threads:[~2020-05-04 9:20 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200504092021.2D3D0383F84B@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).