Index: src/backend/utils/adt/date.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/adt/date.c,v
retrieving revision 1.120
diff -c -c -r1.120 date.c
*** src/backend/utils/adt/date.c	9 Sep 2005 02:31:49 -0000	1.120
--- src/backend/utils/adt/date.c	7 Oct 2005 21:00:34 -0000
***************
*** 920,926 ****
  	*result = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec)
  				* USECS_PER_SEC) + fsec;
  #else
! 	*result = ((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
  #endif
  	return 0;
  }
--- 920,926 ----
  	*result = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec)
  				* USECS_PER_SEC) + fsec;
  #else
! 	*result = JROUND(((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec);
  #endif
  	return 0;
  }
***************
*** 1345,1351 ****
  	result = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
  				USECS_PER_SEC) + fsec;
  #else
! 	result = ((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
  #endif
  
  	PG_RETURN_TIMEADT(result);
--- 1345,1351 ----
  	result = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
  				USECS_PER_SEC) + fsec;
  #else
! 	result = JROUND(((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec);
  #endif
  
  	PG_RETURN_TIMEADT(result);
***************
*** 1382,1388 ****
  	result = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
  				USECS_PER_SEC) + fsec;
  #else
! 	result = ((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
  #endif
  
  	PG_RETURN_TIMEADT(result);
--- 1382,1388 ----
  	result = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
  				USECS_PER_SEC) + fsec;
  #else
! 	result = JROUND(((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec);
  #endif
  
  	PG_RETURN_TIMEADT(result);
***************
*** 1712,1718 ****
  	result->time = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
  					USECS_PER_SEC) + fsec;
  #else
! 	result->time = ((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec;
  #endif
  	result->zone = tz;
  
--- 1712,1718 ----
  	result->time = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) *
  					USECS_PER_SEC) + fsec;
  #else
! 	result->time = JROUND(((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec + fsec);
  #endif
  	result->zone = tz;
  
Index: src/backend/utils/adt/timestamp.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v
retrieving revision 1.153
diff -c -c -r1.153 timestamp.c
*** src/backend/utils/adt/timestamp.c	9 Sep 2005 06:46:14 -0000	1.153
--- src/backend/utils/adt/timestamp.c	7 Oct 2005 21:00:38 -0000
***************
*** 1255,1261 ****
  static double
  time2t(const int hour, const int min, const int sec, const fsec_t fsec)
  {
! 	return (((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec + fsec;
  }	/* time2t() */
  #endif
  
--- 1255,1261 ----
  static double
  time2t(const int hour, const int min, const int sec, const fsec_t fsec)
  {
! 	return JROUND((((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec + fsec);
  }	/* time2t() */
  #endif
  
***************
*** 3505,3511 ****
  				result += ((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
  							tm->tm_sec + (fsec / 1000000.0)) / (double)SECS_PER_DAY;
  #else
! 				result += ((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
  							tm->tm_sec + fsec) / (double)SECS_PER_DAY;
  #endif
  				break;
--- 3505,3511 ----
  				result += ((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
  							tm->tm_sec + (fsec / 1000000.0)) / (double)SECS_PER_DAY;
  #else
! 				result += JROUND((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
  							tm->tm_sec + fsec) / (double)SECS_PER_DAY;
  #endif
  				break;
***************
*** 3733,3739 ****
  				result += ((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
  							tm->tm_sec + (fsec / 1000000.0)) / (double)SECS_PER_DAY;
  #else
! 				result += ((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
  							tm->tm_sec + fsec) / (double)SECS_PER_DAY;
  #endif
  				break;
--- 3733,3739 ----
  				result += ((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
  							tm->tm_sec + (fsec / 1000000.0)) / (double)SECS_PER_DAY;
  #else
! 				result += JROUND((((tm->tm_hour * MINS_PER_HOUR) + tm->tm_min) * SECS_PER_MINUTE) +
  							tm->tm_sec + fsec) / (double)SECS_PER_DAY;
  #endif
  				break;
Index: src/interfaces/ecpg/pgtypeslib/timestamp.c
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/pgtypeslib/timestamp.c,v
retrieving revision 1.31
diff -c -c -r1.31 timestamp.c
*** src/interfaces/ecpg/pgtypeslib/timestamp.c	22 Jul 2005 19:00:55 -0000	1.31
--- src/interfaces/ecpg/pgtypeslib/timestamp.c	7 Oct 2005 21:00:40 -0000
***************
*** 27,33 ****
  static double
  time2t(const int hour, const int min, const int sec, const fsec_t fsec)
  {
! 	return (((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec + fsec;
  }	/* time2t() */
  #endif
  
--- 27,33 ----
  static double
  time2t(const int hour, const int min, const int sec, const fsec_t fsec)
  {
! 	return 	JROUND((((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec + fsec);
  }	/* time2t() */
  #endif