Commit93c7e50

committed

Correct compile failures in REL6_4 datetime code.

1 parent3533684 commit93c7e50Copy full SHA for 93c7e50

File tree

-16

lines changed

-16

lines changed

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.25.2.2 1999/02/13 05:59:34 thomas Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.25.2.3 1999/03/06 22:49:03 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -27,14 +27,6 @@`
`27`	`27`
`28`	`28`	`staticintdate2tm(DateADTdateVal,inttzp,structtmtm,doublefsec,char*tzn);`
`29`	`29`
`30`		`-#if0`
`31`		`-staticintday_tab[2][12]= {`
`32`		`-{31,28,31,30,31,30,31,31,30,31,30,31},`
`33`		`-{31,29,31,30,31,30,31,31,30,31,30,31}};`
`34`		`-`
`35`		`-#defineisleap(y) (((y % 4) == 0 && (y % 100) != 0) \|\| (y % 400) == 0)`
`36`		`-#endif`
`37`		`-`
`38`	`30`	`#defineUTIME_MINYEAR (1901)`
`39`	`31`	`#defineUTIME_MINMONTH (12)`
`40`	`32`	`#defineUTIME_MINDAY (14)`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.59.2.2 1999/02/13 05:59:34 thomas Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.59.2.3 1999/03/06 22:49:01 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -56,8 +56,6 @@ static inttm2timespan(struct tm * tm, double fsec, TimeSpan *span);`
`56`	`56`	`#defineROUND_ALL 0`
`57`	`57`
`58`	`58`	`#if0`
`59`		`-#defineisleap(y) (((y % 4) == 0) && (((y % 100) != 0) \|\| ((y % 400) == 0)))`
`60`		`-`
`61`	`59`	`intmdays[]= {31,28,31,30,31,30,31,31,30,31,30,31,0};`
`62`	`60`	`#endif`
`63`	`61`
`@@ -2302,8 +2300,7 @@ datetkn *deltacache[MAXDATEFIELDS] = {NULL};`
`2302`	`2300`	`* These routines will be used by other date/time packages - tgl 97/02/25`
`2303`	`2301`	`*/`
`2304`	`2302`
`2305`		`-#if0`
`2306`		`-XXXmovedtodt.h-thomas1999-01-15`
	`2303`	`+#if1`
`2307`	`2304`	`/* Set the minimum year to one greater than the year of the first valid day`
`2308`	`2305`	`*to avoid having to check year and day both. - tgl 97/05/08`
`2309`	`2306`	`*/`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* Copyright (c) 1994, Regents of the University of California`
`10`	`10`	`*`
`11`		`- * $Id: dt.h,v 1.33.2.1 1999/03/03 05:11:39 thomas Exp $`
	`11`	`+ * $Id: dt.h,v 1.33.2.2 1999/03/06 22:49:01 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -269,7 +269,7 @@ extern intdatetime_is_epoch(double j);`
`269`	`269`
`270`	`270`	`externintday_tab[2][13];`
`271`	`271`
`272`		`-#defineisleap(y) (((y % 4) == 0 && (y % 100) != 0) \|\| (y % 400) == 0)`
	`272`	`+#defineisleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 \|\| ((y) % 400) == 0))`
`273`	`273`
`274`	`274`	`/* Julian date support for date2j() and j2date()`
`275`	`275`	`* Set the minimum year to one greater than the year of the first valid day`

Comments

(0)