*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.111 2005/07/10 21:13:59 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.112 2005/07/12 15:17:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
double trem;
trem = time;
- TMODULO(trem, tm->tm_hour, 3600e0);
- TMODULO(trem, tm->tm_min, 60e0);
- TMODULO(trem, tm->tm_sec, 1e0);
+ TMODULO(trem, tm->tm_hour, 3600.0);
+ TMODULO(trem, tm->tm_min, 60.0);
+ TMODULO(trem, tm->tm_sec, 1.0);
*fsec = trem;
#endif
else if (type == RESERV && val == DTK_EPOCH)
{
#ifdef HAVE_INT64_TIMESTAMP
- result = (time / 1000000e0);
+ result = (time / 1000000.0);
#else
result = time;
#endif
#else
double trem = time->time;
- TMODULO(trem, tm->tm_hour, 3600e0);
- TMODULO(trem, tm->tm_min, 60e0);
- TMODULO(trem, tm->tm_sec, 1e0);
+ TMODULO(trem, tm->tm_hour, 3600.0);
+ TMODULO(trem, tm->tm_min, 60.0);
+ TMODULO(trem, tm->tm_sec, 1.0);
*fsec = trem;
#endif
case DTK_TZ_MINUTE:
result = -tz;
result /= 60;
- FMODULO(result, dummy, 60e0);
+ FMODULO(result, dummy, 60.0);
break;
case DTK_TZ_HOUR:
dummy = -tz;
- FMODULO(dummy, result, 3600e0);
+ FMODULO(dummy, result, 3600.0);
break;
case DTK_MICROSEC:
else if (type == RESERV && val == DTK_EPOCH)
{
#ifdef HAVE_INT64_TIMESTAMP
- result = time->time / 1000000e0 + time->zone;
+ result = time->time / 1000000.0 + time->zone;
#else
result = time->time + time->zone;
#endif
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.130 2005/07/10 21:13:59 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.131 2005/07/12 15:17:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
*fsec = (time - (tm->tm_sec * USECS_PER_SEC));
#else
TMODULO(time, tm->tm_mday, (double)SECS_PER_DAY);
- TMODULO(time, tm->tm_hour, 3600e0);
- TMODULO(time, tm->tm_min, 60e0);
- TMODULO(time, tm->tm_sec, 1e0);
+ TMODULO(time, tm->tm_hour, 3600.0);
+ TMODULO(time, tm->tm_min, 60.0);
+ TMODULO(time, tm->tm_sec, 1.0);
*fsec = time;
#endif
{
case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP
- result = tm->tm_sec * 1000000e0 + fsec;
+ result = tm->tm_sec * 1000000.0 + fsec;
#else
result = (tm->tm_sec + fsec) * 1000000;
#endif
case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP
- result = tm->tm_sec * 1000e0 + fsec / 1000e0;
+ result = tm->tm_sec * 1000.0 + fsec / 1000.0;
#else
result = (tm->tm_sec + fsec) * 1000;
#endif
case DTK_SECOND:
#ifdef HAVE_INT64_TIMESTAMP
- result = tm->tm_sec + fsec / 1000000e0;
+ result = tm->tm_sec + fsec / 1000000.0;
#else
result = tm->tm_sec + fsec;
#endif
result = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday);
#ifdef HAVE_INT64_TIMESTAMP
result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) +
- tm->tm_sec + (fsec / 1000000e0)) / (double)SECS_PER_DAY;
+ tm->tm_sec + (fsec / 1000000.0)) / (double)SECS_PER_DAY;
#else
result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) +
tm->tm_sec + fsec) / (double)SECS_PER_DAY;
errmsg("timestamp out of range")));
#ifdef HAVE_INT64_TIMESTAMP
- result = (timestamptz - SetEpochTimestamp()) / 1000000e0;
+ result = (timestamptz - SetEpochTimestamp()) / 1000000.0;
#else
result = timestamptz - SetEpochTimestamp();
#endif
case DTK_TZ_MINUTE:
result = -tz;
result /= 60;
- FMODULO(result, dummy, 60e0);
+ FMODULO(result, dummy, 60.0);
break;
case DTK_TZ_HOUR:
dummy = -tz;
- FMODULO(dummy, result, 3600e0);
+ FMODULO(dummy, result, 3600.0);
break;
case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP
- result = tm->tm_sec * 1000000e0 + fsec;
+ result = tm->tm_sec * 1000000.0 + fsec;
#else
result = (tm->tm_sec + fsec) * 1000000;
#endif
case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP
- result = tm->tm_sec * 1000e0 + fsec / 1000e0;
+ result = tm->tm_sec * 1000.0 + fsec / 1000.0;
#else
result = (tm->tm_sec + fsec) * 1000;
#endif
case DTK_SECOND:
#ifdef HAVE_INT64_TIMESTAMP
- result = tm->tm_sec + fsec / 1000000e0;
+ result = tm->tm_sec + fsec / 1000000.0;
#else
result = tm->tm_sec + fsec;
#endif
result = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday);
#ifdef HAVE_INT64_TIMESTAMP
result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) +
- tm->tm_sec + (fsec / 1000000e0)) / (double)SECS_PER_DAY;
+ tm->tm_sec + (fsec / 1000000.0)) / (double)SECS_PER_DAY;
#else
result += ((((tm->tm_hour * 60) + tm->tm_min) * 60) +
tm->tm_sec + fsec) / (double)SECS_PER_DAY;
{
case DTK_EPOCH:
#ifdef HAVE_INT64_TIMESTAMP
- result = (timestamp - SetEpochTimestamp()) /1000000e0;
+ result = (timestamp - SetEpochTimestamp()) /1000000.0;
#else
result = timestamp - SetEpochTimestamp();
#endif
{
case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP
- result = tm->tm_sec * 1000000e0 + fsec;
+ result = tm->tm_sec * 1000000.0 + fsec;
#else
result = (tm->tm_sec + fsec) * 1000000;
#endif
case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP
- result = tm->tm_sec * 1000e0 + fsec / 1000e0;
+ result = tm->tm_sec * 1000.0 + fsec / 1000.0;
#else
result = (tm->tm_sec + fsec) * 1000;
#endif
case DTK_SECOND:
#ifdef HAVE_INT64_TIMESTAMP
- result = tm->tm_sec + fsec / 1000000e0;
+ result = tm->tm_sec + fsec / 1000000.0;
#else
result = tm->tm_sec + fsec;
#endif
else if (type == RESERV && val == DTK_EPOCH)
{
#ifdef HAVE_INT64_TIMESTAMP
- result = interval->time / 1000000e0;
+ result = interval->time / 1000000.0;
#else
result = interval->time;
#endif