derick Tue Jul 18 12:38:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date php_date.c php_date.h
Log:
- Enable all new date functions and classes
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.16&r2=1.43.2.45.2.17&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.16
php-src/ext/date/php_date.c:1.43.2.45.2.17
--- php-src/ext/date/php_date.c:1.43.2.45.2.16 Mon Jul 10 11:26:22 2006
+++ php-src/ext/date/php_date.c Tue Jul 18 12:38:05 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.16 2006/07/10 11:26:22 tony2001 Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.17 2006/07/18 12:38:05 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -165,7 +165,6 @@
PHP_FE(localtime, arginfo_localtime)
PHP_FE(getdate, arginfo_getdate)
-#ifdef EXPERIMENTAL_DATE_SUPPORT
/* Advanced Interface */
PHP_FE(date_create, NULL)
PHP_FE(date_parse, NULL)
@@ -186,7 +185,6 @@
PHP_FE(timezone_transistions_get, NULL)
PHP_FE(timezone_identifiers_list, NULL)
PHP_FE(timezone_abbreviations_list, NULL)
-#endif
/* Options and Configuration */
PHP_FE(date_default_timezone_set, arginfo_date_default_timezone_set)
@@ -199,7 +197,6 @@
{NULL, NULL, NULL}
};
-#ifdef EXPERIMENTAL_DATE_SUPPORT
zend_function_entry date_funcs_date[] = {
ZEND_NAMED_FE(format, ZEND_FN(date_format), NULL)
ZEND_NAMED_FE(modify, ZEND_FN(date_modify), NULL)
@@ -222,7 +219,6 @@
};
static void date_register_classes(TSRMLS_D);
-#endif
static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC);
/* }}} */
@@ -252,7 +248,6 @@
PHP_INI_END()
/* }}} */
-#ifdef EXPERIMENTAL_DATE_SUPPORT
zend_class_entry *date_ce_date, *date_ce_timezone;
static zend_object_handlers date_object_handlers_date;
@@ -293,7 +288,6 @@
static void date_object_free_storage_timezone(void *object TSRMLS_DC);
static zend_object_value date_object_new_date(zend_class_entry *class_type
TSRMLS_DC);
static zend_object_value date_object_new_timezone(zend_class_entry *class_type
TSRMLS_DC);
-#endif
/* {{{ Module struct */
zend_module_entry date_module_entry = {
@@ -457,9 +451,7 @@
PHP_MINIT_FUNCTION(date)
{
REGISTER_INI_ENTRIES();
-#ifdef EXPERIMENTAL_DATE_SUPPORT
date_register_classes(TSRMLS_C);
-#endif
/*
* RFC4287, Section 3.3: http://www.ietf.org/rfc/rfc4287.txt
* A Date construct is an element whose content MUST conform to the
@@ -1434,7 +1426,6 @@
}
/* }}} */
-#ifdef EXPERIMENTAL_DATE_SUPPORT
static void date_register_classes(TSRMLS_D)
{
zend_class_entry ce_date, ce_timezone;
@@ -1995,7 +1986,6 @@
entry++;
} while (entry->name);
}
-#endif
/* {{{ proto bool date_default_timezone_set(string timezone_identifier)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.h?r1=1.17.2.11&r2=1.17.2.11.2.1&diff_format=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.17.2.11
php-src/ext/date/php_date.h:1.17.2.11.2.1
--- php-src/ext/date/php_date.h:1.17.2.11 Tue Apr 11 18:03:46 2006
+++ php-src/ext/date/php_date.h Tue Jul 18 12:38:05 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.h,v 1.17.2.11 2006/04/11 18:03:46 derick Exp $ */
+/* $Id: php_date.h,v 1.17.2.11.2.1 2006/07/18 12:38:05 derick Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -46,7 +46,6 @@
PHP_FUNCTION(localtime);
PHP_FUNCTION(getdate);
-#ifdef EXPERIMENTAL_DATE_SUPPORT
/* Advanced Interface */
PHP_FUNCTION(date_create);
PHP_FUNCTION(date_parse);
@@ -67,7 +66,6 @@
PHP_FUNCTION(timezone_transistions_get);
PHP_FUNCTION(timezone_identifiers_list);
PHP_FUNCTION(timezone_abbreviations_list);
-#endif
/* Options and Configuration */
PHP_FUNCTION(date_default_timezone_set);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
