Remove HAVE_STRFTIME

Function strftime is part of the C89 standard [1] and current systems
don't need to check for its presence anymore.

Additionally, checks for strftime function in tests have been removed
since the PHP strftime function is now always available.

1: https://port70.net/~nsz/c/c89/c89-draft.html

diff --git a/configure.ac b/configure.ac
index 43317ba10fa6acda24ebfd98f6494a6e7bada312..7fc0dc77f06249efb88be61405a273759b63021d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -657,7 +657,6 @@ strcasecmp \
 strcoll \
 strdup \
 strerror \
-strftime \
 strnlen \
 strptime \
 strstr \

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 58176dbd87197c0846ac041bb9307d786b5f170e..d218d011d83c0fffd36f998bae4e6fa6341dfd5c 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -409,12 +409,8 @@ static const zend_function_entry date_functions[] = {
        PHP_FE(mktime, arginfo_mktime)
        PHP_FE(gmmktime, arginfo_gmmktime)
        PHP_FE(checkdate, arginfo_checkdate)
-
-#ifdef HAVE_STRFTIME
        PHP_FE(strftime, arginfo_strftime)
        PHP_FE(gmstrftime, arginfo_gmstrftime)
-#endif
-
        PHP_FE(time, arginfo_time)
        PHP_FE(localtime, arginfo_localtime)
        PHP_FE(getdate, arginfo_getdate)
@@ -1636,7 +1632,6 @@ PHP_FUNCTION(checkdate)
 }
 /* }}} */
 
-#ifdef HAVE_STRFTIME
 /* {{{ php_strftime - (gm)strftime helper */
 PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 {
@@ -1748,7 +1743,6 @@ PHP_FUNCTION(gmstrftime)
        php_strftime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
 /* }}} */
-#endif
 
 /* {{{ proto int time(void)
    Return current UNIX timestamp */

diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index 1d8a3786864b9300c5914f7c232a4ab109b91c7f..cadb99ba0c0837ec64ce636492d6ff7a63a83895 100644 (file)
--- a/ext/date/php_date.h
+++ b/ext/date/php_date.h
@@ -37,12 +37,8 @@ PHP_FUNCTION(mktime);
 PHP_FUNCTION(gmmktime);
 
 PHP_FUNCTION(checkdate);
-
-#ifdef HAVE_STRFTIME
 PHP_FUNCTION(strftime);
 PHP_FUNCTION(gmstrftime);
-#endif
-
 PHP_FUNCTION(time);
 PHP_FUNCTION(localtime);
 PHP_FUNCTION(getdate);
@@ -207,10 +203,10 @@ ZEND_END_MODULE_GLOBALS(date)
 PHPAPI zend_long php_parse_date(char *string, zend_long *now);
 PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
 PHPAPI int php_idate(char format, time_t ts, int localtime);
-#if HAVE_STRFTIME
+
 #define _php_strftime php_strftime
+
 PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm);
-#endif
 PHPAPI zend_string *php_format_date(char *format, size_t format_len, time_t ts, int localtime);
 
 /* Mechanism to set new TZ database */

diff --git a/ext/date/tests/009.phpt b/ext/date/tests/009.phpt
index ae8011eebd2443edf18532bb6fc51e88855f38bb..4812d63de6de08024dc7e34932c819a7921e6739 100644 (file)
--- a/ext/date/tests/009.phpt
+++ b/ext/date/tests/009.phpt
@@ -3,7 +3,6 @@ strftime() and gmstrftime() tests
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') die('skip posix only test.');
-if (!function_exists('strftime')) die("skip, strftime not available");
 ?>
 --FILE--
 <?php

diff --git a/ext/date/tests/009_win32.phpt b/ext/date/tests/009_win32.phpt
index 3da5b35c81cab807d0ef6af1e41ec223eb334da9..91c1b261ce3f519b13785ce3c7c54002b4a43b5b 100644 (file)
--- a/ext/date/tests/009_win32.phpt
+++ b/ext/date/tests/009_win32.phpt
@@ -3,7 +3,6 @@ strftime() and gmstrftime() tests
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') die('skip only windows test.');
-if (!function_exists('strftime')) die("skip, strftime not available");
 if (false === setlocale(LC_TIME, "en-us")) die("skip, couldn't set the locale to en-us");
 ?>
 --FILE--

diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c
index 1364bd96c089dad0e26b51f7313e739132a45d5b..af42e11cacfa38d7d51721df519cd830977be312 100644 (file)
--- a/ext/interbase/ibase_query.c
+++ b/ext/interbase/ibase_query.c
@@ -1396,22 +1396,7 @@ format_date_time:
                        if (flag & PHP_IBASE_UNIXTIME) {
                                ZVAL_LONG(val, mktime(&t));
                        } else {
-#if HAVE_STRFTIME
                                l = strftime(string_data, sizeof(string_data), format, &t);
-#else
-                               switch (type & ~1) {
-                                       default:
-                                               l = slprintf(string_data, sizeof(string_data), "%02d/%02d/%4d %02d:%02d:%02d", t.tm_mon+1, t.tm_mday,
-                                                       t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec);
-                                               break;
-                                       case SQL_TYPE_DATE:
-                                               l = slprintf(string_data, sizeof(string_data), "%02d/%02d/%4d", t.tm_mon + 1, t.tm_mday, t.tm_year+1900);
-                                               break;
-                                       case SQL_TYPE_TIME:
-                                               l = slprintf(string_data, sizeof(string_data), "%02d:%02d:%02d", t.tm_hour, t.tm_min, t.tm_sec);
-                                               break;
-                               }
-#endif
                                ZVAL_STRINGL(val, string_data, l);
                                break;
                        }

diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c
index 7b4b7eecd7ab68b8cb24df613bf78d8134dd97d7..918422027e273b19019eaae049e60e78cbf38595 100644 (file)
--- a/ext/opcache/Optimizer/zend_func_info.c
+++ b/ext/opcache/Optimizer/zend_func_info.c
@@ -878,10 +878,8 @@ static const func_info_t func_infos[] = {
        F0("mktime",                                MAY_BE_FALSE | MAY_BE_LONG),
        F0("gmmktime",                              MAY_BE_FALSE | MAY_BE_LONG),
        F0("checkdate",                             MAY_BE_FALSE | MAY_BE_TRUE),
-#ifdef HAVE_STRFTIME
        F1("strftime",                              MAY_BE_FALSE | MAY_BE_STRING),
        F1("gmstrftime",                            MAY_BE_FALSE | MAY_BE_STRING),
-#endif
        F0("time",                                  MAY_BE_LONG),
        F1("localtime",                             MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG),
        F1("getdate",                               MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING),

diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index df12cf1213d4480c950d4c9595c3c468d95bf38d..067305c763a377afa742f711f09c122adf6bbe43 100644 (file)
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -105,7 +105,6 @@
 #define HAVE_LIBM 1
 #define HAVE_CUSERID 0
 #undef HAVE_RINT
-#define HAVE_STRFTIME 1
 #define SIZEOF_SHORT 2
 /* int and long are stll 32bit in 64bit compiles */
 #define SIZEOF_INT 4