From 5d35ad8996a02cfea3bd7f6fd8ad1df4211d8b88 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 27 Apr 2020 11:13:05 +0200 Subject: [PATCH] Cygwin: localtime.cc: reformat for easier patching Signed-off-by: Corinna Vinschen --- 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);