From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 2D3D0383F84B; Mon, 4 May 2020 09:20:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2D3D0383F84B Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: localtime.cc: reformat for easier patching X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: d94763fc2e506d81793130569f166b1a14ac31f3 X-Git-Newrev: f2e06d8af5f390d81b64375a69ca834ca19d6029 Message-Id: <20200504092021.2D3D0383F84B@sourceware.org> Date: Mon, 4 May 2020 09:20:21 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 09:20:21 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=f2e06d8af5f390d81b64375a69ca834ca19d6029 commit f2e06d8af5f390d81b64375a69ca834ca19d6029 Author: Corinna Vinschen Date: Mon Apr 27 11:13:05 2020 +0200 Cygwin: localtime.cc: reformat for easier patching Signed-off-by: Corinna Vinschen 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);