mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add last-ditch defense against attempts to compile datetime code with

Browse Source 
-ffast-math.
This commit is contained in:
Tom Lane 2002-09-21 19:52:41 +00:00
parent eb3adab568
commit e303a2dbe8
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/utils/adt/date.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.72 2002/09/04 20:31:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.73 2002/09/21 19:52:41 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -27,11 +27,19 @@
#include "utils/nabstime.h" #include "utils/nabstime.h"
#include "utils/timestamp.h" #include "utils/timestamp.h"
/*
* gcc's -ffast-math switch breaks routines that expect exact results from
* expressions like timeval / 3600, where timeval is double.
*/
#ifdef __FAST_MATH__
#error -ffast-math is known to break this code
#endif
int time2tm(TimeADT time, struct tm * tm, fsec_t *fsec);
int timetz2tm(TimeTzADT *time, struct tm * tm, fsec_t *fsec, int *tzp); static int time2tm(TimeADT time, struct tm * tm, fsec_t *fsec);
int tm2time(struct tm * tm, fsec_t fsec, TimeADT *result); static int timetz2tm(TimeTzADT *time, struct tm * tm, fsec_t *fsec, int *tzp);
int tm2timetz(struct tm * tm, fsec_t fsec, int tz, TimeTzADT *result); static int tm2time(struct tm * tm, fsec_t fsec, TimeADT *result);
static int tm2timetz(struct tm * tm, fsec_t fsec, int tz, TimeTzADT *result);
static void AdjustTimeForTypmod(TimeADT *time, int32 typmod); static void AdjustTimeForTypmod(TimeADT *time, int32 typmod);
/***************************************************************************** /*****************************************************************************
@ -525,7 +533,7 @@ time_in(PG_FUNCTION_ARGS)
/* tm2time() /* tm2time()
* Convert a tm structure to a time data type. * Convert a tm structure to a time data type.
*/ */
int static int
tm2time(struct tm * tm, fsec_t fsec, TimeADT *result) tm2time(struct tm * tm, fsec_t fsec, TimeADT *result)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
@ -542,7 +550,7 @@ tm2time(struct tm * tm, fsec_t fsec, TimeADT *result)
* For dates within the system-supported time_t range, convert to the * For dates within the system-supported time_t range, convert to the
* local time zone. If out of this range, leave as GMT. - tgl 97/05/27 * local time zone. If out of this range, leave as GMT. - tgl 97/05/27
*/ */
int static int
time2tm(TimeADT time, struct tm * tm, fsec_t *fsec) time2tm(TimeADT time, struct tm * tm, fsec_t *fsec)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
@ -1285,7 +1293,7 @@ time_part(PG_FUNCTION_ARGS)
/* tm2timetz() /* tm2timetz()
* Convert a tm structure to a time data type. * Convert a tm structure to a time data type.
*/ */
int static int
tm2timetz(struct tm * tm, fsec_t fsec, int tz, TimeTzADT *result) tm2timetz(struct tm * tm, fsec_t fsec, int tz, TimeTzADT *result)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
@ -1357,7 +1365,7 @@ timetz_out(PG_FUNCTION_ARGS)
* For dates within the system-supported time_t range, convert to the * For dates within the system-supported time_t range, convert to the
* local time zone. If out of this range, leave as GMT. - tgl 97/05/27 * local time zone. If out of this range, leave as GMT. - tgl 97/05/27
*/ */
int static int
timetz2tm(TimeTzADT *time, struct tm * tm, fsec_t *fsec, int *tzp) timetz2tm(TimeTzADT *time, struct tm * tm, fsec_t *fsec, int *tzp)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP

12
src/backend/utils/adt/timestamp.c
View File

@ -1,14 +1,14 @@
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* *
* timestamp.c * timestamp.c
* Functions for the built-in SQL92 type "timestamp" and "interval". * Functions for the built-in SQL92 types "timestamp" and "interval".
* *
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.73 2002/09/04 20:31:29 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.74 2002/09/21 19:52:41 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -28,6 +28,14 @@
#include "utils/array.h" #include "utils/array.h"
#include "utils/builtins.h" #include "utils/builtins.h"
/*
* gcc's -ffast-math switch breaks routines that expect exact results from
* expressions like timeval / 3600, where timeval is double.
*/
#ifdef __FAST_MATH__
#error -ffast-math is known to break this code
#endif
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
static int64 time2t(const int hour, const int min, const int sec, const fsec_t fsec); static int64 time2t(const int hour, const int min, const int sec, const fsec_t fsec);