Commit439cf8e

Michael Meskes

committed

Do not try to find local timezone in DecodeDateTime() because the

result is not used anyway. This also fixes Vista's build problems.

1 parenta8d539f commit439cf8eCopy full SHA for 439cf8e

File tree

-17

lines changed

-17

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2194,8 +2194,8 @@ Thu, 10 May 09:42:42 CEST 2007`
`2194`	`2194`	`- Synced parser and keyword list.`
`2195`	`2195`	`- Renamed update test so it hopefully runs on Vista.`
`2196`	`2196`
`2197`		`-Th, 17 May 2007 22:03:40 +0200`
	`2197`	`+Sun, 20 May 2007 22:01:11 +0200`
`2198`	`2198`
`2199`		`--Removed mktime() call tohopefully get rid of some compatibility`
`2200`		`- problems.`
	`2199`	`+-Do not try tofind local timezone in DecodeDateTime() because the`
	`2200`	`+result is not used anyway. This also fixes Vista's buildproblems.`
`2201`	`2201`	`- Set ecpg version to 4.3.1.`

Lines changed: 6 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/dt_common.c,v 1.38 2007/05/20 11:30:30 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/dt_common.c,v 1.39 2007/05/21 07:04:00 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#include"postgres_fe.h"`
`4`	`4`
`@@ -2528,20 +2528,12 @@ DecodeDateTime(char *field, int ftype, int nf,`
`2528`	`2528`	`if (tm->tm_mday<1\|\|tm->tm_mday>day_tab[isleap(tm->tm_year)][tm->tm_mon-1])`
`2529`	`2529`	`return-1;`
`2530`	`2530`
`2531`		`-/* timezone not specified? then find local timezone if possible */`
`2532`		`-if ((fmask&DTK_DATE_M)==DTK_DATE_M&&tzp!=NULL&& !(fmask&DTK_M(TZ)))`
`2533`		`-{`
`2534`		`-/*`
`2535`		`- * daylight savings time modifier but no standard timezone? then`
`2536`		`- * error`
`2537`		`- */`
`2538`		`-if (fmask&DTK_M(DTZMOD))`
	`2531`	`+/* backend tried to find local timezone here`
	`2532`	`+ * but we don't use the result afterwards anyway`
	`2533`	`+ * so we only check for this error:`
	`2534`	`+ * daylight savings time modifier but no standard timezone? */`
	`2535`	`+if ((fmask&DTK_DATE_M)==DTK_DATE_M&&tzp!=NULL&& !(fmask&DTK_M(TZ))&& (fmask&DTK_M(DTZMOD)))`
`2539`	`2536`	`return-1;`
`2540`		`-`
`2541`		`-/* test to see if this is the reason for the error on Vista`
`2542`		`- * doesn't seem to be used anyway`
`2543`		`- * tzp = DetermineLocalTimeZone(tm); /`
`2544`		`-}`
`2545`	`2537`	`}`
`2546`	`2538`
`2547`	`2539`	`return0;`

Comments

(0)