open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove use of deprecated Autoconf define

Browse Source 
Change from HAVE_TM_ZONE to HAVE_STRUCT_TM_TM_ZONE.
pull/47/head
Peter Eisentraut 6 years ago
parent 6a5084eed4
commit 4d7e5a5db0
2 changed files with 6 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      src/interfaces/ecpg/pgtypeslib/dt_common.c
  2. 8
      src/interfaces/ecpg/pgtypeslib/timestamp.c

4
src/interfaces/ecpg/pgtypeslib/dt_common.c
Unescape View File

@ -995,7 +995,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm *tm, char **tzn)
tm->tm_sec = tx->tm_sec; tm->tm_sec = tx->tm_sec;
tm->tm_isdst = tx->tm_isdst; tm->tm_isdst = tx->tm_isdst;
#if defined(HAVE_TM_ZONE) #if defined(HAVE_STRUCT_TM_TM_ZONE)
tm->tm_gmtoff = tx->tm_gmtoff; tm->tm_gmtoff = tx->tm_gmtoff;
tm->tm_zone = tx->tm_zone; tm->tm_zone = tx->tm_zone;
@ -1041,7 +1041,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm *tm, char **tzn)
} }
else else
tm->tm_isdst = -1; tm->tm_isdst = -1;
#else /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */ #else /* not (HAVE_STRUCT_TM_TM_ZONE || HAVE_INT_TIMEZONE) */
if (tzp != NULL) if (tzp != NULL)
{ {
/* default to UTC */ /* default to UTC */

8
src/interfaces/ecpg/pgtypeslib/timestamp.c
Unescape View File

@ -100,7 +100,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm *tm, fsec_t *fsec, const char **t
int64 dDate, int64 dDate,
date0; date0;
int64 time; int64 time;
#if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE) #if defined(HAVE_STRUCT_TM_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
time_t utime; time_t utime;
struct tm *tx; struct tm *tx;
#endif #endif
@ -134,7 +134,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm *tm, fsec_t *fsec, const char **t
*/ */
if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday)) if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday))
{ {
#if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE) #if defined(HAVE_STRUCT_TM_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
utime = dt / USECS_PER_SEC + utime = dt / USECS_PER_SEC +
((date0 - date2j(1970, 1, 1)) * INT64CONST(86400)); ((date0 - date2j(1970, 1, 1)) * INT64CONST(86400));
@ -147,7 +147,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm *tm, fsec_t *fsec, const char **t
tm->tm_min = tx->tm_min; tm->tm_min = tx->tm_min;
tm->tm_isdst = tx->tm_isdst; tm->tm_isdst = tx->tm_isdst;
#if defined(HAVE_TM_ZONE) #if defined(HAVE_STRUCT_TM_TM_ZONE)
tm->tm_gmtoff = tx->tm_gmtoff; tm->tm_gmtoff = tx->tm_gmtoff;
tm->tm_zone = tx->tm_zone; tm->tm_zone = tx->tm_zone;
@ -159,7 +159,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm *tm, fsec_t *fsec, const char **t
if (tzn != NULL) if (tzn != NULL)
*tzn = TZNAME_GLOBAL[(tm->tm_isdst > 0)]; *tzn = TZNAME_GLOBAL[(tm->tm_isdst > 0)];
#endif #endif
#else /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */ #else /* not (HAVE_STRUCT_TM_TM_ZONE || HAVE_INT_TIMEZONE) */
*tzp = 0; *tzp = 0;
/* Mark this as *no* time zone available */ /* Mark this as *no* time zone available */
tm->tm_isdst = -1; tm->tm_isdst = -1;

Write Preview
Loading…
Cancel
Save