]> granicus.if.org Git - postgresql/commitdiff
Remove use of deprecated Autoconf define
authorPeter Eisentraut <peter@eisentraut.org>
Mon, 7 Oct 2019 14:27:31 +0000 (16:27 +0200)
committerPeter Eisentraut <peter@eisentraut.org>
Mon, 7 Oct 2019 14:47:23 +0000 (16:47 +0200)
Change from HAVE_TM_ZONE to HAVE_STRUCT_TM_TM_ZONE.

src/interfaces/ecpg/pgtypeslib/dt_common.c
src/interfaces/ecpg/pgtypeslib/timestamp.c

index e71defaa66a6486183a9178b9b6f561c1cd4e3aa..29c111754695025bd90c57e15b71ecf9b3510388 100644 (file)
@@ -995,7 +995,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm *tm, char **tzn)
        tm->tm_sec = tx->tm_sec;
        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_zone = tx->tm_zone;
 
@@ -1041,7 +1041,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm *tm, char **tzn)
        }
        else
                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)
        {
                /* default to UTC */
index e830ee737e7e891133ac301e720e2403f97b8d3e..2be151f7e66691b1301cf8a938d022ccdc8d9736 100644 (file)
@@ -100,7 +100,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm *tm, fsec_t *fsec, const char **t
        int64           dDate,
                                date0;
        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;
        struct tm  *tx;
 #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 defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
+#if defined(HAVE_STRUCT_TM_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
 
                        utime = dt / USECS_PER_SEC +
                                ((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_isdst = tx->tm_isdst;
 
-#if defined(HAVE_TM_ZONE)
+#if defined(HAVE_STRUCT_TM_TM_ZONE)
                        tm->tm_gmtoff = tx->tm_gmtoff;
                        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)
                                *tzn = TZNAME_GLOBAL[(tm->tm_isdst > 0)];
 #endif
-#else                                                  /* not (HAVE_TM_ZONE || HAVE_INT_TIMEZONE) */
+#else                                                  /* not (HAVE_STRUCT_TM_TM_ZONE || HAVE_INT_TIMEZONE) */
                        *tzp = 0;
                        /* Mark this as *no* time zone available */
                        tm->tm_isdst = -1;