sniper Sun Jul 3 19:30:53 2005 EDT
Modified files:
/php-src/ext/date php_date.c php_date.h
/php-src/ext/date/lib timelib.m4
Log:
- Always use #ifdef when dealing with HAVE_* defines from AC_CHECK_FUNCS()
- Added check for strftime() also in the timelib configure
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.27&r2=1.28&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.27 php-src/ext/date/php_date.c:1.28
--- php-src/ext/date/php_date.c:1.27 Sun Jul 3 17:38:53 2005
+++ php-src/ext/date/php_date.c Sun Jul 3 19:30:51 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.27 2005/07/03 21:38:53 derick Exp $ */
+/* $Id: php_date.c,v 1.28 2005/07/03 23:30:51 sniper Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -33,12 +33,12 @@
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 @@
}
/* }}} */
-#if HAVE_STRFTIME
+#ifdef HAVE_STRFTIME
/* {{{ php_strftime
*/
PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
http://cvs.php.net/diff.php/php-src/ext/date/php_date.h?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.10 php-src/ext/date/php_date.h:1.11
--- php-src/ext/date/php_date.h:1.10 Sun Jul 3 16:45:08 2005
+++ php-src/ext/date/php_date.h Sun Jul 3 19:30:51 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.h,v 1.10 2005/07/03 20:45:08 derick Exp $ */
+/* $Id: php_date.h,v 1.11 2005/07/03 23:30:51 sniper Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -33,7 +33,7 @@
PHP_FUNCTION(checkdate);
-#if HAVE_STRFTIME
+#ifdef HAVE_STRFTIME
PHP_FUNCTION(strftime);
PHP_FUNCTION(gmstrftime);
#endif
http://cvs.php.net/diff.php/php-src/ext/date/lib/timelib.m4?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/date/lib/timelib.m4
diff -u php-src/ext/date/lib/timelib.m4:1.3 php-src/ext/date/lib/timelib.m4:1.4
--- php-src/ext/date/lib/timelib.m4:1.3 Tue Jun 28 14:05:58 2005
+++ php-src/ext/date/lib/timelib.m4 Sun Jul 3 19:30:52 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: timelib.m4,v 1.3 2005/06/28 18:05:58 derick Exp $
+dnl $Id: timelib.m4,v 1.4 2005/07/03 23:30:52 sniper Exp $
dnl
dnl
dnl TL_DEF_HAVE(what [, why])
@@ -77,4 +77,4 @@
])
dnl Check for strtoll, atoll
-AC_CHECK_FUNCS(strtoll atoll)
+AC_CHECK_FUNCS(strtoll atoll strftime)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
