- Always use #ifdef when dealing with HAVE_* defines from AC_CHECK_FUNCS()

- Added check for strftime() also in the timelib configure

diff --git a/ext/date/lib/timelib.m4 b/ext/date/lib/timelib.m4
index e0a01ae0300578503e878b94f3adbd1941e7b5f6..c7255727f24e6dd6b99e133ee42677c1a3c5c4ad 100644 (file)
--- a/ext/date/lib/timelib.m4
+++ b/ext/date/lib/timelib.m4
@@ -77,4 +77,4 @@ stdlib.h
 ])
 
 dnl Check for strtoll, atoll
-AC_CHECK_FUNCS(strtoll atoll)
+AC_CHECK_FUNCS(strtoll atoll strftime)

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 581e0e394a7db4acc301fe8d75c28a68902d5884..b5a1b66ccf9db395bf7f15e8f622bad01cd92068 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -33,12 +33,12 @@ function_entry date_functions[] = {
        PHP_FE(date, NULL)
        PHP_FE(gmdate, NULL)
        PHP_FE(mktime, NULL)
+       PHP_FE(gmmktime, NULL)
        PHP_FE(checkdate, NULL)
-       PHP_FE(gmstrftime, NULL)
 
-#if HAVE_STRFTIME
+#ifdef HAVE_STRFTIME
        PHP_FE(strftime, NULL)
-       PHP_FE(gmmktime, NULL)
+       PHP_FE(gmstrftime, NULL)
 #endif
 
        PHP_FE(time, NULL)
@@ -548,7 +548,7 @@ PHP_FUNCTION(checkdate)
 }
 /* }}} */
 
-#if HAVE_STRFTIME
+#ifdef HAVE_STRFTIME
 /* {{{ php_strftime
  */
 PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)

diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index 4fd126b6109048d3b3bdf3eec76f0531c2c984bf..d7691cf6b621cf9860e594c7d7a126367b152c74 100644 (file)
--- a/ext/date/php_date.h
+++ b/ext/date/php_date.h
@@ -33,7 +33,7 @@ PHP_FUNCTION(gmmktime);
 
 PHP_FUNCTION(checkdate);
 
-#if HAVE_STRFTIME
+#ifdef HAVE_STRFTIME
 PHP_FUNCTION(strftime);
 PHP_FUNCTION(gmstrftime);
 #endif