Skip to content

Commit 8fdd794

Browse files
committed
Portability fix from Ryan Kirkpatrick's Alpha patches. I believe this
is the only diff not accounted for by fmgr rewrite...
1 parent 228c1e7 commit 8fdd794

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/backend/utils/adt/nabstime.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*-------------------------------------------------------------------------
22
* nabstime.c
33
* Utilities for the built-in type "AbsoluteTime".
44
* Functions for the built-in type "RelativeTime".
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.76 2000/12/03 20:45:36 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.77 2000/12/09 20:40:57 tgl Exp $
1313
*
1414
* NOTES
1515
*
@@ -33,12 +33,6 @@
3333
#include "utils/builtins.h"
3434

3535

36-
#if 0
37-
static AbsoluteTime tm2abstime(struct tm * tm, int tz);
38-
39-
#endif
40-
41-
4236
#define MIN_DAYNUM -24856 /* December 13, 1901 */
4337
#define MAX_DAYNUM 24854 /* January 18, 2038 */
4438

@@ -103,6 +97,7 @@ static int sec_tab[] = {
10397
* Function prototypes -- internal to this file only
10498
*/
10599

100+
static AbsoluteTime tm2abstime(struct tm * tm, int tz);
106101
static void reltime2tm(RelativeTime time, struct tm * tm);
107102

108103
#ifdef NOT_USED
@@ -115,6 +110,7 @@ static int istinterval(char *i_string,
115110
AbsoluteTime *i_start,
116111
AbsoluteTime *i_end);
117112

113+
118114
/* GetCurrentAbsoluteTime()
119115
* Get the current system time. Set timezone parameters if not specified elsewhere.
120116
* Define HasTZSet to allow clients to specify the default timezone.
@@ -291,8 +287,8 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char *tzn)
291287
static AbsoluteTime
292288
tm2abstime(struct tm * tm, int tz)
293289
{
294-
int day,
295-
sec;
290+
int day;
291+
AbsoluteTime sec;
296292

297293
/* validate, before going out of range on some members */
298294
if (tm->tm_year < 1901 || tm->tm_year > 2038

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy